From nobody Thu Apr 27 18:20:10 2023 X-Original-To: dev-commits-src-branches@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 4Q6kYR2Dt4z47lG1; Thu, 27 Apr 2023 18:20:11 +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 4Q6kYR0G2kz42WY; Thu, 27 Apr 2023 18:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682619611; 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=dW7Akudx1rMC+fzE4CPvtdRzyOObZvwu/ydCqravzT8=; b=REWtpgL/KE/C1idKRM5IAAWpv4Ek5j8C5/aS+mHxJipUNKMKKfXcKgNP9YFOQ2ihYcx+kJ yIkHx5ox2eVVdbylGHuPl23H0jlsf0kX3CZzUDMrx/Ggv+8OIYk8NW8zPVUTN5jmGgWrP6 5rCBuvvvISZ5msqJZ5RH64P33kNg/lxuDSO+nrdpLjfWV26Ly53vzpbMvdW5qhHfb6S4Jz 5dIZ6vLrRfDlQ8qbIDOertV6n89fYZNV9zmQVo2jZhdpFRgk1a7DkiumqGa+gzaiI8cVSt d2svLWWg6kg3hj7RjAm9Ee/D7BDRceUTFbSW/QCWmkQAwkdzReRFOqvj0uVifg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682619611; 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=dW7Akudx1rMC+fzE4CPvtdRzyOObZvwu/ydCqravzT8=; b=KDxPyPTJnnIZfKF9ukMKP7hfs2PzyM+S0DeGZ9BfdE8smqVBCSlX7JUpXGizAI8SneAewU 9+xCuvluwCidRVGhcnKR+xgc3vohTiAXExqcXI9oDkXvrsBKYYXXxIbcToBVqc8m4F56b/ 4jro9JYsBeiSrEGECbBYayOP5RXLKALMllFzGG0DzpOXahJotD4LcmH2fhmMv9cY76Q6q0 iVYf+3umA1Cj57QN+29UbAV0XgVigy6O3ed3l0QE+HYBqUB69zhJwvLaKOtMQ1Wb+UeGnn 1JLZIvs3Edt4xtfZj71MqkO7Ox0Yhgn5ndNJVjprUFfH4pAq7aUsEC4UhEaEQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682619611; a=rsa-sha256; cv=none; b=UzXYrx4ybVnatDnttpzRTkQbrWec08RRl6YXHMb2RUM1oe+hcmTedJveMyHYU0MB7N65ZC jFf7AyrVBregdORxhQ9u8TLbLHyitmuVgpisnEFs6VwfYiJSEEXFj5WHgDOXfpX0aMzyDU t6Nd6XcT3+K1OwZZGad9WDQqiITu3WJmmaOurOOcwby+uMNZwtSr8FuqdAWz3zQ3YJC4Iw mRxMBH0GMUyysEa8EvnpXvwihQNInafQ+YFBM6UW3dWiNCZZx3f5vGDjLRXzcb6GqCgN9+ 3zXzwp6bgQ4n02ngyfraT37n7c8W5iEL/MDo4Qt/KpbHx4eZbFwK5TRLUKHjLQ== 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 4Q6kYQ68pdzSNV; Thu, 27 Apr 2023 18:20:10 +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 33RIKAH2068674; Thu, 27 Apr 2023 18:20:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RIKAa8068667; Thu, 27 Apr 2023 18:20:10 GMT (envelope-from git) Date: Thu, 27 Apr 2023 18:20:10 GMT Message-Id: <202304271820.33RIKAa8068667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 937d152b3e62 - stable/13 - rtld: reindent and style(9) elf_hash() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 937d152b3e62f936334887759798ebf5fc55e53e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=937d152b3e62f936334887759798ebf5fc55e53e commit 937d152b3e62f936334887759798ebf5fc55e53e Author: Ed Maste AuthorDate: 2023-04-12 15:06:14 +0000 Commit: Ed Maste CommitDate: 2023-04-27 17:05:17 +0000 rtld: reindent and style(9) elf_hash() In preparation for an upcoming change (D39517). Sponsored by: The FreeBSD Foundation (cherry picked from commit 87443cb6c669b51ceaa7f85db63191374477efc1) --- 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 30cb4b595b71..49685508d4dc 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1843,17 +1843,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); } /*