From nobody Mon Apr 29 04:27:15 2024 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 4VSVfW5zGvz5JBmY; Mon, 29 Apr 2024 04:27:15 +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 4VSVfW3C6Dz412Z; Mon, 29 Apr 2024 04:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714364835; 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=TSdOzTNpc3WmNbp7/xiu3casLWk2x4g8dk0Bg+vy4Bs=; b=O4vRVpFFJVN/BYtd7PL3w6m3VlNE7hw6++P5NoYSCQ+vf0bG0pG9FHVZ7kKj66KU4C+MB5 aQWv7rnIbg4fGQieEFgoGwvF4xkpGeXhMuZQDnuGJmuhH7sKeD0bIrF02fojDHrHdhhQMD xxfqXhgAcQUhO64bH8NIRdCRP8PrsawtQcThVJnsIMTrRWR6kDP11IqRpMFKQHG7oqA7Ix eWE3NwmjOK0ULwBWMlv1zs6CRoW07UJT42C9I+a6d+MfXr7fUQJI12m1jTdjtvtUVoqwnQ k2MgmT5mP21LV3hhJj+XUCp9kviK8JrAfihtczrANKbd8XaIxUO6FA0+PDIYRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714364835; a=rsa-sha256; cv=none; b=M7Qr9HSx7+vLNGxg16q3OKvhHNZFI8xPbkUyJMpxr9t1kiTitXcYPvOgcs9z3SLaKCPg8K A+W5Lzfbqylo4WfFzPaR1NVuQRTQhCcUOtUBAlyFf0oC2xk+FI0xwzgVFc7shUHgKEOE0E KH3hleOTZZMXPivFs0S6G7c8UBv5vM+oHvDHYHR5wjdVgPg85+cJC66Ti918UFrkBFzQPK UCKtDaEGhEZBL8y30kV5nmqu1R36gHlMTBdveJbJZf/qtpDS5KLNV3iF4TMIE4gXp0ukWd 78o3gs/levzM9UGsEpNK73Sz5o7uQzgqZNifLAogi4T6Q2Vnb8dhq72mtk2fJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714364835; 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=TSdOzTNpc3WmNbp7/xiu3casLWk2x4g8dk0Bg+vy4Bs=; b=kXpwJDfkskK7VmCqRT63kUfwwZ+mv/lb6iQ82ITpmaPVbcJpOZ+8qxvc7GkUiWTS0EzL96 x+E9UM517acKnAUESoS+rb6bjbSnnVFP5HHsakTsIdNki+zjual28qXdJ+NWGS7WvN2ac1 3H40Iq211ZU3r9hkoqxSdHEeokizgFMNJmD2iJPvMAvumdBI3x7EdLE+EmNH/Pg8zff4EF AaIb7AzhkCP5HiXm+DYrJqAKBAScyZMcM1O9YrYMFlIdqcTVMAdZ5WxOONdaNAhfcRQA37 yl+lVvfC1jKersD94VrsfZHOw6pjZ76qe/4R4USLJyOotLK1oclWBN6BT2utig== 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 4VSVfW245Vzv11; Mon, 29 Apr 2024 04:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43T4RFY7044583; Mon, 29 Apr 2024 04:27:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43T4RFQJ044580; Mon, 29 Apr 2024 04:27:15 GMT (envelope-from git) Date: Mon, 29 Apr 2024 04:27:15 GMT Message-Id: <202404290427.43T4RFQJ044580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8918cc95e869 - main - btxld: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0]) 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8918cc95e869ce4a9c7fb15221577444a8c66215 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8918cc95e869ce4a9c7fb15221577444a8c66215 commit 8918cc95e869ce4a9c7fb15221577444a8c66215 Author: Elyes Haouas AuthorDate: 2023-11-07 17:10:52 +0000 Commit: Warner Losh CommitDate: 2024-04-29 03:24:47 +0000 btxld: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0]) Pull Request: https://github.com/freebsd/freebsd-src/pull/888 Signed-off-by: Elyes Haouas --- usr.sbin/btxld/elfh.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/btxld/elfh.c b/usr.sbin/btxld/elfh.c index 8e9ea16c2cf6..5122aca8b3c9 100644 --- a/usr.sbin/btxld/elfh.c +++ b/usr.sbin/btxld/elfh.c @@ -26,7 +26,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include @@ -53,9 +53,9 @@ const struct elfh elfhdr = { 0, /* e_flags */ htole16(sizeof(elfhdr.e)), /* e_ehsize */ htole16(sizeof(elfhdr.p[0])), /* e_phentsize */ - htole16(sizeof(elfhdr.p) / sizeof(elfhdr.p[0])), /* e_phnum */ + htole16(nitems(elfhdr.p)), /* e_phnum */ htole16(sizeof(elfhdr.sh[0])), /* e_shentsize */ - htole16(sizeof(elfhdr.sh) / sizeof(elfhdr.sh[0])), /* e_shnum */ + htole16(nitems(elfhdr.sh)), /* e_shnum */ htole16(1) /* e_shstrndx */ }, {