From nobody Mon Apr 29 04:27:19 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 4VSVfc1rfzz5JBmk; Mon, 29 Apr 2024 04:27:20 +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 4VSVfb62T6z419p; Mon, 29 Apr 2024 04:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714364839; 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=njnsMEYzCcXkA/3vi29aiZvDq29HZs+FrqpEHIIE9no=; b=F0DsE9K0RT/4AkYvlzeWQ5Yo7qpy5xkgLl6/cwFb7zwm/LTZIypXQKigy/72zyqLqbAWxT oDtiAivrTJgDVesZaPSXs0DC9QeNNBOKkFfhnp77AgLjF97NGajQEXV4nqjduFc5FoNMn8 94J6m+1oh4eTNm/SrVR/eRg/SIJF99eL2tzYCq1p323qvI46tvKD5D4OFZOYXiNJHoH9eO ZgRV4Wtk4F+OXuRfXuMJ1HwHa7llGTNz5dITeiody+IKODHK0fd6NMzxBjXii5VOI9IB9G nUo98f9NzH3OFszbn8xJE7ayGj6tW5AofNH9ue/EggL2TU1FKfnzErKwckO3uQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714364839; a=rsa-sha256; cv=none; b=tyaVX8+bwLpQ6ZN7Yfju/thh16t/rmPShUuWi+SDThxyDKUEwbfkl6u9ShcHaqQUuO9VRE cSLEI36TCyhmrCmJL0kkcvFR4VqU5zyCrqmxZ9wppE4RLTGN6LYNLQDOuJf2b3hG/jA69c DXcUqTWL2l4R3jt3DD7+xVhnu/+UddaCTHn2NvnX5E5RW26cJbnkM/jM8h24qaZYP1WrTQ tvvPjGYWG8mPzerTPTWVBJu1FJ4t00Htk7082xvHiymrlGhk3G2QGyYoQNjCX9vUF3KDNj UyPTfugXLfw89kNdyLgWfUSc6UILKzOKGGzci2JFETiPpJ3DrdIidGDlzxUZxA== 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=1714364839; 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=njnsMEYzCcXkA/3vi29aiZvDq29HZs+FrqpEHIIE9no=; b=yKND0IfDlfFAmiSm1w3vjNpmwxKs9enqKhd1+B6o4KSZ0Itg07dNmuYdhgODx5hGyLQ8Fq DoebBhzmM++M139kn9Mi4cKcidMmk7zVbunXuP3+B1/q7zQ8a7RFYLPhWpuYOu7PiBVHpn KJV5kIQRlTibIQCVSQILmPSMhJiqT0ueDPbKDRZ9s9d4H3EGpAtWfVHCT3Yln4uJCYvhG7 st9nCQFh0+UWNPJ+2jgoNabFJrUGIO/QTID13MRzTPsx4nfuFkkDzI3gveuRGUIP60oi4v on/7Zs/NOxL3UYy1boDziEjIn1jIK2s256fcqYq5lYeqidtebIICfJY6OtqBkQ== 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 4VSVfb4vR8zvGd; Mon, 29 Apr 2024 04:27:19 +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 43T4RJd0044775; Mon, 29 Apr 2024 04:27:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43T4RJEe044772; Mon, 29 Apr 2024 04:27:19 GMT (envelope-from git) Date: Mon, 29 Apr 2024 04:27:19 GMT Message-Id: <202404290427.43T4RJEe044772@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: 83409a9357a4 - main - moused: 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: 83409a9357a43f2ba595c84ae6904ab4c3ac1ab9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=83409a9357a43f2ba595c84ae6904ab4c3ac1ab9 commit 83409a9357a43f2ba595c84ae6904ab4c3ac1ab9 Author: Elyes Haouas AuthorDate: 2023-11-07 17:12:44 +0000 Commit: Warner Losh CommitDate: 2024-04-29 03:30:54 +0000 moused: 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/moused/moused.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c index 201e0b6ce0f6..068919f2e941 100644 --- a/usr.sbin/moused/moused.c +++ b/usr.sbin/moused/moused.c @@ -1033,7 +1033,7 @@ moused(void) bstate[i].count = 0; bstate[i].ts = mouse_button_state_ts; } - for (i = 0; i < (int)(sizeof(zstate) / sizeof(zstate[0])); ++i) { + for (i = 0; i < (int)nitems(zstate); ++i) { zstate[i].count = 0; zstate[i].ts = mouse_button_state_ts; } @@ -1489,7 +1489,7 @@ r_identify(void) rodent.mode.level = 0; if (ioctl(rodent.mfd, MOUSE_GETMODE, &rodent.mode) == 0) { if (rodent.mode.protocol == MOUSE_PROTO_UNKNOWN || - rodent.mode.protocol >= (int)(sizeof(proto) / sizeof(proto[0]))) { + rodent.mode.protocol >= (int)nitems(proto)) { logwarnx("unknown mouse protocol (%d)", rodent.mode.protocol); return (MOUSE_PROTO_UNKNOWN); } else { @@ -1564,8 +1564,7 @@ r_name(int type) { const char *unknown = "unknown"; - return (type == MOUSE_PROTO_UNKNOWN || - type >= (int)(sizeof(rnames) / sizeof(rnames[0])) ? + return (type == MOUSE_PROTO_UNKNOWN || type >= (int)nitems(rnames) ? unknown : rnames[type]); }