From nobody Mon Apr 29 04:27:12 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 4VSVfT3YJtz5JBv9; Mon, 29 Apr 2024 04:27:13 +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 4VSVfT0prkz41G5; Mon, 29 Apr 2024 04:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714364833; 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=AvfmL+ielotoUhTPSw07Vb7HYd+Ghz/FW+Z89SBeROo=; b=jFkBRMyc6+lx+gnYP/QnS/L92MCyUCnkY1DstMkhrudoU5ovwCOudfhpgDLra6RfvScuCr Apv1di2/Fmg3S77UnUH2E6vte6Yb6GO4JMToDsKgYMlWncPDcAkr0smizgU2iwHmvyL/XY BX9ywkdbQvEoR9UQN6Bfsd3k8IxuMU+OmI7Jy87G4vVw4JN6BkTB5zcYGFV5DujSuqALbA TIyqQJYOBbC3pgX5PYAx2wbGLP8f48xqjZpGi1/ZtUmSViymx7RSKNeFIjO6FpFnenHEMP NFDHziRz7ksO16WiYj+0ypJ4Wvr3zXJMhJj8Jqf+wZTXLUzN1Gcs3oUgw1rIwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714364833; a=rsa-sha256; cv=none; b=TlcvaZ8AJN4SKFaWa19mdCN4p+WMmvp8YQ8qsrj6zwmN19TY6Gs29nq5x8FUjkQET0Bklm 0NzYd/lbgglxzqcaU4wk01mShIRYy1HAtZCpMH3nxPaJat//3SYE+nbrZs252EnE8IsN2D imnNPxnb8y2nieQtEAVxnn0NORU5hGB29zT48jMX/GkXPFEOe0b5yoQoW7DI6evMOYmECe vvCpEd4YWyPB6bdO492TzDx9eJ/JoYWEvfjSst8oCOupZZsZ11FPNwxgaMXMWoF7ZgYCF9 +hJBi6Y2u9xRXRG+JqSRubNfYnUcF1fpPerk1sOh1IKGlXAIVf9qKcnr0aDeCg== 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=1714364833; 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=AvfmL+ielotoUhTPSw07Vb7HYd+Ghz/FW+Z89SBeROo=; b=FbLvA3My15cEXvxOI2Xv2hUo2XQIlPmuqD2ZIRM01HiNXo8HdhJy5EBA+TsHb/aK5WFuDZ YAWn5xqYreUcJUB/8E024BDHUVA6CLwJWfj6Muj+kHb1jjA6UTvdElNvloogH1fc8ecC52 SIiouIPhGDSTUj9Kig95AAHaANntKA3p3ZLI7/4BiJEADOdfGVq0NxIfiH7/sLnyVSIIw3 XCucMG4wh6AEVjL7ol9RCeXwhFpna60smO2dT4g1ZDrpDqXkJFMbkK+smxDYlQ1eGcXhlj eHF87ubFYXWhuWUYt8EE0v7fWbM2X6H2vV31k/UC/CiGiRwfp53gZFQutGn82g== 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 4VSVfT02nqzv10; Mon, 29 Apr 2024 04:27:13 +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 43T4RCQR044491; Mon, 29 Apr 2024 04:27:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43T4RCbx044488; Mon, 29 Apr 2024 04:27:12 GMT (envelope-from git) Date: Mon, 29 Apr 2024 04:27:12 GMT Message-Id: <202404290427.43T4RCbx044488@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: 93e96d6c87dc - main - rtadvd: 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: 93e96d6c87dc8dd84cdfc56a155dc0611f55ac86 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=93e96d6c87dc8dd84cdfc56a155dc0611f55ac86 commit 93e96d6c87dc8dd84cdfc56a155dc0611f55ac86 Author: Elyes Haouas AuthorDate: 2024-04-29 02:55:30 +0000 Commit: Warner Losh CommitDate: 2024-04-29 03:24:46 +0000 rtadvd: 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/rtadvd/control.c | 6 +++--- usr.sbin/rtadvd/control_server.c | 4 ++-- usr.sbin/rtadvd/if.c | 2 +- usr.sbin/rtadvd/rtadvd.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/rtadvd/control.c b/usr.sbin/rtadvd/control.c index 80af6371a269..54a944833f64 100644 --- a/usr.sbin/rtadvd/control.c +++ b/usr.sbin/rtadvd/control.c @@ -27,8 +27,8 @@ * */ +#include #include -#include #include #include #include @@ -75,7 +75,7 @@ cm_recv(int fd, char *buf) pfds[0].events = POLLIN; for (;;) { - i = poll(pfds, sizeof(pfds)/sizeof(pfds[0]), + i = poll(pfds, nitems(pfds), CM_RECV_TIMEOUT); if (i == 0) @@ -131,7 +131,7 @@ cm_recv(int fd, char *buf) msglen); for (;;) { - i = poll(pfds, sizeof(pfds)/sizeof(pfds[0]), + i = poll(pfds, nitems(pfds), CM_RECV_TIMEOUT); if (i == 0) diff --git a/usr.sbin/rtadvd/control_server.c b/usr.sbin/rtadvd/control_server.c index e96a1958dd10..60fdc5ca2ec0 100644 --- a/usr.sbin/rtadvd/control_server.c +++ b/usr.sbin/rtadvd/control_server.c @@ -27,8 +27,8 @@ * */ +#include #include -#include #include #include #include @@ -527,7 +527,7 @@ cm_getprop(struct ctrl_msg_pl *cp) return (1); for (i = 0; - i < sizeof(getprop_dtable) / sizeof(getprop_dtable[0]); + i < nitems(getprop_dtable); i++) { if (strcmp(cp->cp_key, getprop_dtable[i].dt_comm) == 0) return (getprop_dtable[i].dt_act(cp)); diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c index 6212639ba028..e1702a0aa72a 100644 --- a/usr.sbin/rtadvd/if.c +++ b/usr.sbin/rtadvd/if.c @@ -642,7 +642,7 @@ getinet6sysctl(int code) mib[3] = code; size = sizeof(value); - if (sysctl(mib, sizeof(mib)/sizeof(mib[0]), &value, &size, NULL, 0) + if (sysctl(mib, nitems(mib), &value, &size, NULL, 0) < 0) { syslog(LOG_ERR, "<%s>: failed to get ip6 sysctl(%d): %s", __func__, code, diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c index aa9038b65e63..fa5640afa96c 100644 --- a/usr.sbin/rtadvd/rtadvd.c +++ b/usr.sbin/rtadvd/rtadvd.c @@ -328,7 +328,7 @@ main(int argc, char *argv[]) "<%s> there's no timer. waiting for inputs", __func__); } - if ((i = poll(set, sizeof(set)/sizeof(set[0]), + if ((i = poll(set, nitems(set), timeout ? (timeout->tv_sec * 1000 + timeout->tv_nsec / 1000 / 1000) : INFTIM)) < 0) {