From nobody Mon Apr 29 04:27:17 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 4VSVfZ06tjz5JBrp; Mon, 29 Apr 2024 04:27:18 +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 4VSVfY4qhvz41Lg; Mon, 29 Apr 2024 04:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714364837; 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=h/y0KgHf2s7qC5Q8Iz9xxYcyteGsntNhkmudTtYhrZw=; b=vL7s71cx96GXVxgSRip08B0XZeublmPlFnTUYy5w3Eog6Z9kgnKaXsBauE64EMrdcBZFdY M6uZg8v8zpIvp5Wwo+9CRBOD8gh82LsIAbjEX0RH5Bw2SHVgWp4biRKvTE443NAJigujUf 4yTEOK9Pcd/7pPnZ8CfbSAmwnvU5KpE7/R6VjrXid6q3uv4i2/Hk01cMMF9QasYzOlWokQ VsYVQxTuiUt0QXtc65WFBY/fjaOaBfRdhZGfRnicuqQAhLl2bzfxSv3iJyPMrLm9jGvBEo fqUnRFa07dFvHCJJp7eFC9otoknRh+kmyX6AbRpOhdySxssmcx32/AdZqIdd8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714364837; a=rsa-sha256; cv=none; b=tx00ur7C+I5CX64QD5eOAhA4nb6aBq5BpfDI0mhoPNQXkgtrcemyzGjs58WUv+WyUpXjb1 BIwRtrpD50g/AQ4Srz6a7fDbMOPki9sVgSOBDcMXqDkb8b8w0zNu7IDpXExsNGt683E/RK l69gzFuOkv0TYx0G6LxjOayqf55keVKJGpQh6sNlKQuw6exZwVG0KigPGlREasJ3N7gPAv 0eVACMPeKgUIYdNUbfyYg28WFscjzXW7I/EDfPhqAp0U+ejX97oMIaJmdwv5GfvP3/LIn9 IgVovNA1dnlfekocpwxWta4bupKYBjv/ISQ/2lLZTG6Do9WKCzDeEIF6MR2J+A== 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=1714364837; 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=h/y0KgHf2s7qC5Q8Iz9xxYcyteGsntNhkmudTtYhrZw=; b=nOvuRtQyES0z4LOliYiyZJcd/bt5eugPQuWROkn5pGnhy/FyFlqUiv8e4jV9Zt/zEXB18a Hadts+dn5Wf2rvOlTUBabTsxob9qQWCdEo0J+zolvXWQ/ub0uueL/IozJvgCJY2aMhTSgO TwVjeVM1BfAL7JKenzA6Ezb6+G2z290l7e8BY5LqTpGzr7PU0bEum6ttlvhwdvcJn+xvsX 9qET6H+DoTF5Srt3PXAT4Tbz+7R31s9MXemv5fo5Ctx5voX9CcQf2Smx1sLeusXO+R9lMF du2ery8/psiIHAplUVQ9tdQv0JmZrofZybxeqfwXhylJr579pLHxwAVy10un7w== 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 4VSVfY3gFqzvGc; Mon, 29 Apr 2024 04:27:17 +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 43T4RHw9044675; Mon, 29 Apr 2024 04:27:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43T4RHnC044672; Mon, 29 Apr 2024 04:27:17 GMT (envelope-from git) Date: Mon, 29 Apr 2024 04:27:17 GMT Message-Id: <202404290427.43T4RHnC044672@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: 8f65dcd6276b - main - ctld: 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: 8f65dcd6276bf139a2fe87c1bbeffcc1fed015e4 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8f65dcd6276bf139a2fe87c1bbeffcc1fed015e4 commit 8f65dcd6276bf139a2fe87c1bbeffcc1fed015e4 Author: Elyes Haouas AuthorDate: 2023-11-07 17:11:34 +0000 Commit: Warner Losh CommitDate: 2024-04-29 03:24:47 +0000 ctld: 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/ctld/kernel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c index cdc0b0fa187d..dd1c89d0e9b8 100644 --- a/usr.sbin/ctld/kernel.c +++ b/usr.sbin/ctld/kernel.c @@ -168,7 +168,7 @@ cctl_start_element(void *user_data, const char *name, const char **attr) if ((u_int)devlist->level >= (sizeof(devlist->cur_sb) / sizeof(devlist->cur_sb[0]))) log_errx(1, "%s: too many nesting levels, %zd max", __func__, - sizeof(devlist->cur_sb) / sizeof(devlist->cur_sb[0])); + nitems(devlist->cur_sb)); devlist->cur_sb[devlist->level] = sbuf_new_auto(); if (devlist->cur_sb[devlist->level] == NULL) @@ -290,7 +290,7 @@ cctl_start_pelement(void *user_data, const char *name, const char **attr) if ((u_int)devlist->level >= (sizeof(devlist->cur_sb) / sizeof(devlist->cur_sb[0]))) log_errx(1, "%s: too many nesting levels, %zd max", __func__, - sizeof(devlist->cur_sb) / sizeof(devlist->cur_sb[0])); + nitems(devlist->cur_sb)); devlist->cur_sb[devlist->level] = sbuf_new_auto(); if (devlist->cur_sb[devlist->level] == NULL)