hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-09-21 07:36:38 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

moused: Use nitems(foo) instead of sizeof(foo)/sizeof(foo[0])

Browse Source 
Pull Request: https://github.com/freebsd/freebsd-src/pull/888
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
This commit is contained in:
Elyes Haouas 2023-11-07 18:12:44 +01:00 committed by Warner Losh
parent 338d9c35d5
commit 83409a9357
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/moused/moused.c
View File

@ -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]);
}