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

Pull Request: #888 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
freebsd · Apr 29, 2024 · 2f8ea2f · 2f8ea2f
1 parent 8918cc9
commit 2f8ea2f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c
@@ -2809,7 +2809,7 @@ cctl_islist_start_element(void *user_data, const char *name, const char **attr)
 	if ((u_int)islist->level >= (sizeof(islist->cur_sb) /
 	    sizeof(islist->cur_sb[0])))
 		errx(1, "%s: too many nesting levels, %zd max", __func__,
-		     sizeof(islist->cur_sb) / sizeof(islist->cur_sb[0]));
+		     nitems(islist->cur_sb));
 
 	islist->cur_sb[islist->level] = sbuf_new_auto();
 	if (islist->cur_sb[islist->level] == NULL)
@@ -3240,7 +3240,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])))
 		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)
@@ -3504,7 +3504,7 @@ cctl_start_pelement(void *user_data, const char *name, const char **attr)
 	if ((u_int)portlist->level >= (sizeof(portlist->cur_sb) /
 	    sizeof(portlist->cur_sb[0])))
 		errx(1, "%s: too many nesting levels, %zd max", __func__,
-		     sizeof(portlist->cur_sb) / sizeof(portlist->cur_sb[0]));
+		     nitems(portlist->cur_sb));
 
 	portlist->cur_sb[portlist->level] = sbuf_new_auto();
 	if (portlist->cur_sb[portlist->level] == NULL)