From nobody Mon Apr 29 04:27:20 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 4VSVfd1qV4z5JBvL; Mon, 29 Apr 2024 04:27:21 +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 4VSVfc6Dbjz41PR; Mon, 29 Apr 2024 04:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714364840; 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=1RwVkoQQNZKWbOB4nMs6vwRMkK9oV2SUjpEzd1gq3Zg=; b=m/t0yJDZPjrTCknbGCdbl4CM4ujILzoZvSAM3l4PW9k7y3OUKqKDKqX2aO4bgP+UF34v3S VHn2CkclO1zSZdWVeIBGxpfSK+iLeyjEXFQ8r0Yby71HZGIbwBXgKlP5VMm61NrZDQQT2y UPEGBRPPfxwz3S9SGu/wT9Fz39HcEbLarPPE8Y1oJOpMk2eeH9kHcyjsreWYtINI/BmM2I aS2kcckO3/eEAZjVieD+zf8exk3MnvudBHZ22V7UM+zZSvaVBizAj59MvgNffgL+PT3zbO T8KGVikSMUEDh8ay80vbd4NdPzLjF8at50Tv4R5NiqfWrxFEk8eWi5xHxA5UYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714364840; a=rsa-sha256; cv=none; b=ywu/f00JH8xiM6aQ89cJVSmCbgEuwuhv9+tME3Eo/3WZqpIByJiqt4AtGniNmmFjhLa4F1 7k/yAHBiAm42m4MKC3hEiIV/dg6Ay02tzuShPciCB5JpC9x/+oE+ZgQ30um+9EJMSyY9M1 IcThB7YKcpr+KNGjbdI2OHzVgKciS9fmrM47P6EO5j/9P3BqlX73E+Uugu0tBPPrmWwcvN CBAARWvxPRDUu15jK+Lt8MQxynG393uVi/e3Cfq2T8nN0guLgeSTviYXRRkE/hp53xKWFJ rBVeSNcryFJ8wlorGbSPMRn3v8OvkesS5RLuI34AsYFxRtuiz/3Bju72daUOhQ== 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=1714364840; 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=1RwVkoQQNZKWbOB4nMs6vwRMkK9oV2SUjpEzd1gq3Zg=; b=lPEH9E1J3nsQlWFyJ7BuixLsC2NM1MHkY34ngfMjAAB9ZVLN30PG2ye6QRECd5bvGykud8 jp3qcUrkMCi61s8pw1qH9z1jG+usH8YSoHZY+yC2b9toJ46NMmcFiI7hP/WYvDL4ZNs2Ng jmYJ2oPAQASc/BAFzSv1W9VRz+5IVfsVrp4b6DRR45OOhZ8Sti+nlscNUgQyyldmC90bMP UVVH+yf3I80n0UEqnQiGq5aKgc3uGXUw4qg7SwfyTnQyftktmS0yZyTFBhNRYGyA1TBQ+f FYZ1N4MfaI7c/IQy4jHKh5pI9ad0uXnqt4B+r9KPNCEDUIuVIXI1ywjCQj/+3A== 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 4VSVfc5YPQztlX; Mon, 29 Apr 2024 04:27:20 +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 43T4RK1W044820; Mon, 29 Apr 2024 04:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43T4RKkx044817; Mon, 29 Apr 2024 04:27:20 GMT (envelope-from git) Date: Mon, 29 Apr 2024 04:27:20 GMT Message-Id: <202404290427.43T4RKkx044817@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: bccbb2fc4bce - main - 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bccbb2fc4bce6c3efc1ba93f222de320db8e020a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bccbb2fc4bce6c3efc1ba93f222de320db8e020a commit bccbb2fc4bce6c3efc1ba93f222de320db8e020a Author: Elyes Haouas AuthorDate: 2023-11-07 17:13:02 +0000 Commit: Warner Losh CommitDate: 2024-04-29 03:30:54 +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 --- 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 9d9ae02dc1e2..dcb3b5e3571b 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -1171,7 +1171,7 @@ rtrlist(void) 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*/ } @@ -1182,7 +1182,7 @@ rtrlist(void) 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*/ } @@ -1257,7 +1257,7 @@ plist(void) int ninflags = opts.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*/ } @@ -1266,7 +1266,7 @@ plist(void) 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*/ }