From nobody Wed Apr 12 16:49:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxTFh6Trqz454yv; Wed, 12 Apr 2023 16:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxTFh5rmJz3C4L; Wed, 12 Apr 2023 16:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681318168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Y6e/gyMuYGJzaNpVChy49n6XQpKtjNgKY8X9Vi4da4=; b=twSEdCfL/AMPHvOBtLbgrWg7KJmVM5BVOSMipgNPEIGb+Q0r9iu2dzYIEFSeLWC5oke4hT j+vgHFuekYe1nbir87yEj/bBxudbQxdt3DHj6pY3RfjSufKqYsPoWJ/Ok2U2SE2yE6BcHv GzQaOmQNm8RhGFtJpRyzDoZhOGOpi8bX0iJrBei8kT/gBIe/mzQxk3HwfzuEfpq6EEwW7e 31+KYcrQEoJXhBdclLHUTWH6fZAfvFYXiqGA6BewHKwcQjcPbzFyfDJ1YSC55e4M+kjpw9 g4yuMNv4eqy75SeB/6Xer6vtiEqCai8UZGK+Qdg18fr+WsfoNlRgPhgqyP+PLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681318168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Y6e/gyMuYGJzaNpVChy49n6XQpKtjNgKY8X9Vi4da4=; b=gf0h+cYkDCXkuQX6a4U3geALKDZaA7VM5mb/djN3/Y1IuP6YC+uHX62/IOrLZ9mIJDsjkj 3gMtX1wLSZc7FxE5lSrXqmryn/HxTuMoAapO5dF/rq3Zgx4j9rHG0z8LAdxwxJ6n5ehLHr iAn/5wg+JuzPciOsVRdFZdEa3zF9pDVQo0zbbpYT8dz/6praryBzAMfx/bmFU4GGzkrfUA 1DS1xQcEPsiCo4Xil4esh81kcLx2rDEPOszWYcGm2LIpi2qw2iADC7kUgtDovmnIgNTqNA L+oh+pJW2AMmUomRlbaEqc+oGpPvY1QXVyeyRvWPJbm5fjC2bYoWZ536UZo+Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681318168; a=rsa-sha256; cv=none; b=KJ3+AW6WQsXi+fJ7xzTtJ3MN3r0dl3d34wXhGbq4QYZ2vW9kZZu9rpcdLa1DAe4IBvitpf 2dtj8vKFwAfzEy4soLptv6/GUGuzN5QXkwkRXuYMx1VxrSzU1Zm7OvPFUiEd/Jde6Fcyvv cDvbdWvHILG0NEe8toOKS5pjiPvnmJTPp624TF5WZICuRmMO+P79kjwAxZQGSy/Nvdr7xx 7BbR52bNE3a0N15Bqset8m3/o3A1jFpRNWE4jrnXpfnAr6zz0If/4Uop++kH9y3BtcgCWQ RaV0YdXxKZCD+qAnKT9OfjdeGz0dbAqwkpnmMJhjySTxBzr0BpMi2fv1ldnhHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxTFh4mVPz16nY; Wed, 12 Apr 2023 16:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33CGnSVH016773; Wed, 12 Apr 2023 16:49:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CGnS5g016772; Wed, 12 Apr 2023 16:49:28 GMT (envelope-from git) Date: Wed, 12 Apr 2023 16:49:28 GMT Message-Id: <202304121649.33CGnS5g016772@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 87443cb6c669 - main - rtld: reindent and style(9) elf_hash() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87443cb6c669b51ceaa7f85db63191374477efc1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=87443cb6c669b51ceaa7f85db63191374477efc1 commit 87443cb6c669b51ceaa7f85db63191374477efc1 Author: Ed Maste AuthorDate: 2023-04-12 15:06:14 +0000 Commit: Ed Maste CommitDate: 2023-04-12 16:43:36 +0000 rtld: reindent and style(9) elf_hash() In preparation for an upcoming change (D39517). Sponsored by: The FreeBSD Foundation --- libexec/rtld-elf/rtld.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 7e4df3392ec7..382b05191a81 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1802,17 +1802,17 @@ donelist_check(DoneList *dlp, const Obj_Entry *obj) unsigned long elf_hash(const char *name) { - const unsigned char *p = (const unsigned char *) name; - unsigned long h = 0; - unsigned long g; - - while (*p != '\0') { - h = (h << 4) + *p++; - if ((g = h & 0xf0000000) != 0) - h ^= g >> 24; - h &= ~g; - } - return (h); + const unsigned char *p = (const unsigned char *)name; + unsigned long h = 0; + unsigned long g; + + while (*p != '\0') { + h = (h << 4) + *p++; + if ((g = h & 0xf0000000) != 0) + h ^= g >> 24; + h &= ~g; + } + return (h); } /*