From nobody Mon Apr 29 04:27:27 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 4VSVfm2FnWz5JBsF; Mon, 29 Apr 2024 04:27:28 +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 4VSVfl5n1zz41Kd; Mon, 29 Apr 2024 04:27:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714364847; 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=2ExCi0D/MSWDkHuhwUWWtltvzcNBAi1+MinP2LdGsek=; b=Q0AelU7+GWSZvktB1y1ZdV6VT9x7xfUlD72FlSkiC/N6jPj/0rsrwbNtK0SU89Nh2W72dz fyyuL9aqcWJiZn6Uk4MBIgRYv+e6jp+ff1ELPxTY93+gR776ody8Bb0icAGnDuKCQFrA4U GQef6kJephX71zIsQ5FUQgP9yY7QRNcRzkCIy0X7mwbZzyJQx0rZmQ2sKTH/f7vtIotZJc OwHTNDMGA7H+5WC7+aS7+H4v8o0SVUtVhlajJhbcFEYygiQMduDYwJZfqXeSzPNPFTNSlW uxGm0g6xLsyXmPZQQ/0sb8EiG1NIYtijlHe4vRmZbKVbLex+HkGmiBrhC61bBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714364847; a=rsa-sha256; cv=none; b=Q3e74NxiuAKYzFDBUHX+KSUddfUeYWwJ4NhYPTfGPmyDAqLfLPVWh1XJfP04rv26dP5bIJ l2lpVCp78z56i2oj/MZvoLsxgKJutSlyL/PrrfIbItBN7tYbcjv58xcOUV9qnv3WQc9JS2 KMmZ/gVC1/iXIi0t9oKQhffZBHlkIAyh+TWzZUqL6aDAN88CAQX0xiebeXRGPmH8YHU+ra cJof3BtPd46fIBX9ZwOpFbV4M+i60YOGAbutDqtV1gG1WpM+nzfrjwLRkorGqrqH16MnnW 6EFLb9XfiIf8+JuSF/yBNe8oHnoFDkyGVZGSl2onWFspC27GhXpmXwgp53zoCA== 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=1714364847; 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=2ExCi0D/MSWDkHuhwUWWtltvzcNBAi1+MinP2LdGsek=; b=ABMlyry897Fci/bPG1Wu5Eql6M1jGlnz209dC2uarmJlo3GL2kaN96zA0lHQQIqUFzAOes 9wVTN/zUYAgIXsBGOn51u8fQzfIIEUvvKUShvYjCdny1mOQA707JYEuo5fnFfCxJ2WJWRV q55HbRPRSJrXSv6RHwZxQAWI/itTQ1PSK7/j4Gr9DYKtgSDpaeiX83Z5tGfw6c3VEURl0r BityszkPre1/KnazS3Kglgh6rSmZByEIyT6desUlfcgQeA4tU4i4sNOE/h8ZQC4W/VS36d T9gPRKYwwpc/XLm9GfkIyDP1b2FrVbjOPerKXwFnFQPk2A74yX47UCGzM9X2Yg== 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 4VSVfl4GR6zv14; Mon, 29 Apr 2024 04:27:27 +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 43T4RRjX045098; Mon, 29 Apr 2024 04:27:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43T4RRph045095; Mon, 29 Apr 2024 04:27:27 GMT (envelope-from git) Date: Mon, 29 Apr 2024 04:27:27 GMT Message-Id: <202404290427.43T4RRph045095@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: b561d8f59c7d - main - zonectl: 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: b561d8f59c7de56f5da576530961aaeea2d89875 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b561d8f59c7de56f5da576530961aaeea2d89875 commit b561d8f59c7de56f5da576530961aaeea2d89875 Author: Elyes Haouas AuthorDate: 2023-11-07 17:14:45 +0000 Commit: Warner Losh CommitDate: 2024-04-29 03:30:55 +0000 zonectl: 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/zonectl/zonectl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/zonectl/zonectl.c b/usr.sbin/zonectl/zonectl.c index 56cd3c436d10..53e5e6599597 100644 --- a/usr.sbin/zonectl/zonectl.c +++ b/usr.sbin/zonectl/zonectl.c @@ -32,8 +32,8 @@ #include #include +#include #include -#include #include #include #include @@ -401,7 +401,7 @@ main(int argc, char **argv) int entry_num; status = scsi_get_nv(zone_cmd_map, - (sizeof(zone_cmd_map) / sizeof(zone_cmd_map[0])), + nitems(zone_cmd_map), optarg, &entry_num, SCSI_NV_FLAG_IG_CASE); if (status == SCSI_NV_FOUND) action = zone_cmd_map[entry_num].value;