From nobody Mon Apr 29 04:27:32 2024 X-Original-To: dev-commits-src-all@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 4VSVfr4zqKz5JBvW; Mon, 29 Apr 2024 04:27:32 +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 4VSVfr29RCz41dn; Mon, 29 Apr 2024 04:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714364852; 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=T8qo+nIH7cJbOmrW1mvWMtnIlgZNXsPo7sCZVSTwZL4=; b=J+DuxbnWci3UUBKVZvEgTQRnpx69uYBkuUXszfKfKRstjZWxRNkOtEycnsJvCbBi0Murd0 whABl+Ue7LYfcPHGMbwZWH+3/EKl24d0Tf0eAIIqcJknt1eDvMV98thymWWNG/w2nPhawp TlneCfhHfHGCC33m77mz0UfReJSP/NMIV3mXQG++toafkjOwZo60B53iTz8c/mAQoKxtF7 Aehh3cnsvxtmQaryMofPkqmCmsS3bJGYeCMX8cS9FGK2z9DcohBP64Yr8MLoWdM3CGwl+e h3veK8moOCNkg9zfPJbu8JJSIk4arPJ3+Lhpg4+06lf5WmvaxYXcWxxfP9+jgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714364852; a=rsa-sha256; cv=none; b=H4DT/a7TNYbRD9NutO8SFfWP5idqB7dP/f4rAK+CN8gGMKBn3q0Gnd6bflo4W1MbVUVkBE 3X6o9JXUlWnrbLW+cHOfzTzPfWTw9/tu4gThujV+eYV0G5GRLJmNGL2bhGkvDyjs5+oiW1 IOpG1KBclvK99hy9EjwTb1ZF7z56yoEKQ0pezacXBS40dIPceWDgCSCXKGJYAoagGtztAS BdC+pqkgmFKNFQ9uYdGjUDQkyDqyMV5xkuJw6ZrW+/7cAnd0cWpnCh/WcU0bEtGcpp8D15 +xnEg0XXNTkhCnxgdP7m6OQWe51JVX+oa4Nu1M36N1wm/llg50tgVp/VgflGOg== 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=1714364852; 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=T8qo+nIH7cJbOmrW1mvWMtnIlgZNXsPo7sCZVSTwZL4=; b=Df74L7WvSBffRbVkc7te/d9vK0e7GYNc+04wokRInqAk9e6vVOEbyQgkgirLwwzTJkK7yL +zchPYKtn2ATbDBkWbbwGBuRE6BBglQVQk1EsG8OmiCjIKbOW7t2K59Az1sQKyngMgq7qs V15Ket1V10uN0K0MONggfR2MQRMnPEDE5Rlhd/fDQ1CQf/lIxcU57JssLkr/ZP8FrxQ/Jp KR9aZt3ewKPwlTBu0KTtbCJeeVzxVMGzucA173PKXA5qg25x4YINiPDBdGooUa5uQ8eqJD cyH+2dswhwxp83qmI1yuFxtGRxSOnAhIrAoMoDD9BHN8FPZcDMHHmxC3wkDJ8A== 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 4VSVfr1Qydzv15; Mon, 29 Apr 2024 04:27:32 +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 43T4RWI4045284; Mon, 29 Apr 2024 04:27:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43T4RWau045281; Mon, 29 Apr 2024 04:27:32 GMT (envelope-from git) Date: Mon, 29 Apr 2024 04:27:32 GMT Message-Id: <202404290427.43T4RWau045281@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: d94c991f3bcd - main - setkey: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0]) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: d94c991f3bcd31b7d001725152fc3a7685afe15b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d94c991f3bcd31b7d001725152fc3a7685afe15b commit d94c991f3bcd31b7d001725152fc3a7685afe15b Author: Elyes Haouas AuthorDate: 2023-11-07 17:38:15 +0000 Commit: Warner Losh CommitDate: 2024-04-29 04:21:09 +0000 setkey: 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 --- sbin/setkey/setkey.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/setkey/setkey.c b/sbin/setkey/setkey.c index d9b905ad845e..f7268d8f1e10 100644 --- a/sbin/setkey/setkey.c +++ b/sbin/setkey/setkey.c @@ -502,7 +502,7 @@ static const char *ipproto[] = { }; #define STR_OR_ID(x, tab) \ - (((x) < sizeof(tab)/sizeof(tab[0]) && tab[(x)]) ? tab[(x)] : numstr(x)) + (((x) < nitems(tab) && tab[(x)]) ? tab[(x)] : numstr(x)) const char * numstr(int x)