From nobody Wed Sep 11 10:09:09 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 4X3brj2Kg8z5WJhC; Wed, 11 Sep 2024 10:09:09 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X3brj1kMyz4MvV; Wed, 11 Sep 2024 10:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726049349; 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=LsrQsotUiUKNIXMvggHjGIO8KXr4fvfdxBpPz/GCZ08=; b=ZgMDHujWAbEPzg0m5RNN1jBFso5yG1Mn/393ek1SBgz6iPXunooM55CHNKK4UJtWuRGFsW lhjans/rBUB/Eqn6YiutcW9465pAUchuXYgXqENyR3VnY/n7zns7MN6e/kDqdB/RjO6zAP QOft0K2Q+aWknlSiQfGDz20HYF7MqdoDlTeZT5TwYm21y8IprOgW7pj6SDagGW1SVDToON X0tQpiGcDrsFOJCDhLVtFawNozYPJrV35rOwKvxckN9aRTSFu7so58sYD3+shTilJBRcme iUcM7ZeROz+1ajTbhQ2LJSXvS7zDaFfFzdFCKh4YTe22N1rAlk7uLmaLgLZP6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726049349; a=rsa-sha256; cv=none; b=S/ZlrUxSn6rZgMkdF0VXfAomJrzZjO00DCXp3GRF/MZfV5xE92NpXOcwHNOqdkjQpLSaMO 3sombOlpmkAMMQPidzpeLOkImYrKu/3ANc4aNoarVeL30t7PPqeaByW7mve74v2NC5hwMJ DskfFCFX+CHeHLIJfuPX91LRUeT4pTbWdmEFJc1elv1SdA7p5bc+xuLtcsfbeWEoXBwWu+ hhl3d1r99ThqonRlN4qUlNl4f56eI0hDWUCeNIxFTAh9XN3dQWJA4XCs+LzL6BmzTe8igC r+fj0ncYDdEG/ezTd5Js7YZe4ICmL7e/427VwmDrxqhfCO+d+GJB9ROJVPa26A== 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=1726049349; 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=LsrQsotUiUKNIXMvggHjGIO8KXr4fvfdxBpPz/GCZ08=; b=N81/pPChnEA07pw1MiGubTUMvhcMDvoSh22mG8pKWKSFxsSnncN8vrGO20HXF1sWOweJ2d Cv6g0Bxf+7o/+Gn4CsjBnbZ/v4ucgJaMshDMhS5OG07jnjVVo3axIntzKeepceztT22zYQ LjyZaH6l2CSASeeWuUFYDW31a+E0InaPJOyCrNAUGZ7ux/is+GOG3XtEV3rmO/R7OIaZvq 4+NSI+zJ4f6ymTMkrOaVlHU0rn3wYB6ZyhcvnVR4HoXwpav+RYNB9QvOjKI4NS4cRcF+RX aAis7qwJP8nQXYAyi9dcZn4ClswtVciuoJJSjqiPC6zQLOzbgnZreYNA7kSq4g== 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 4X3brj1Bt4zQrf; Wed, 11 Sep 2024 10:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48BA99IN046036; Wed, 11 Sep 2024 10:09:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48BA99M1046033; Wed, 11 Sep 2024 10:09:09 GMT (envelope-from git) Date: Wed, 11 Sep 2024 10:09:09 GMT Message-Id: <202409111009.48BA99M1046033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 01b992a87286 - stable/13 - ndp: 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 01b992a87286bd5d8645091ff36c490fb256e5d4 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=01b992a87286bd5d8645091ff36c490fb256e5d4 commit 01b992a87286bd5d8645091ff36c490fb256e5d4 Author: Elyes Haouas AuthorDate: 2023-11-07 17:13:02 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-11 10:07:48 +0000 ndp: 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 (cherry picked from commit bccbb2fc4bce6c3efc1ba93f222de320db8e020a) (cherry picked from commit 635037210ea3e644c9d76b9627323f5ddf5dc5f5) --- usr.sbin/ndp/ndp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index 37c4ee769bff..425afdca56f6 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -1103,7 +1103,7 @@ rtrlist() size_t l; struct timeval now; - if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, &l, NULL, 0) < 0) { + if (sysctl(mib, nitems(mib), NULL, &l, NULL, 0) < 0) { xo_err(1, "sysctl(ICMPV6CTL_ND6_DRLIST)"); /*NOTREACHED*/ } @@ -1114,7 +1114,7 @@ rtrlist() xo_err(1, "malloc"); /*NOTREACHED*/ } - if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, &l, NULL, 0) < 0) { + if (sysctl(mib, nitems(mib), buf, &l, NULL, 0) < 0) { xo_err(1, "sysctl(ICMPV6CTL_ND6_DRLIST)"); /*NOTREACHED*/ } @@ -1189,7 +1189,7 @@ plist() int ninflags = nflag ? NI_NUMERICHOST : 0; char namebuf[NI_MAXHOST]; - if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, &l, NULL, 0) < 0) { + if (sysctl(mib, nitems(mib), NULL, &l, NULL, 0) < 0) { xo_err(1, "sysctl(ICMPV6CTL_ND6_PRLIST)"); /*NOTREACHED*/ } @@ -1198,7 +1198,7 @@ plist() xo_err(1, "malloc"); /*NOTREACHED*/ } - if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, &l, NULL, 0) < 0) { + if (sysctl(mib, nitems(mib), buf, &l, NULL, 0) < 0) { xo_err(1, "sysctl(ICMPV6CTL_ND6_PRLIST)"); /*NOTREACHED*/ }