svn commit: r298250 - in head/sbin: newfs_msdos newfs_nandfs

[Marcelo Araujo]

Author: araujo
Date: Tue Apr 19 04:57:57 2016
New Revision: 298250
URL: https://svnweb.freebsd.org/changeset/base/298250

Log:
  Use nitems() from sys/param.h.
  
  MFC after:	2 weeks.

Modified:
  head/sbin/newfs_msdos/mkfs_msdos.c
  head/sbin/newfs_nandfs/newfs_nandfs.c

Modified: head/sbin/newfs_msdos/mkfs_msdos.c
==============================================================================
--- head/sbin/newfs_msdos/mkfs_msdos.c	Tue Apr 19 04:52:51 2016	(r298249)
+++ head/sbin/newfs_msdos/mkfs_msdos.c	Tue Apr 19 04:57:57 2016	(r298250)
@@ -760,7 +760,7 @@ getstdfmt(const char *fmt, struct bpb *b
 {
     u_int x, i;
 
-    x = sizeof(stdfmt) / sizeof(stdfmt[0]);
+    x = nitems(stdfmt);
     for (i = 0; i < x && strcmp(fmt, stdfmt[i].name); i++);
     if (i == x) {
 	warnx("%s: unknown standard format", fmt);

Modified: head/sbin/newfs_nandfs/newfs_nandfs.c
==============================================================================
--- head/sbin/newfs_nandfs/newfs_nandfs.c	Tue Apr 19 04:52:51 2016	(r298249)
+++ head/sbin/newfs_nandfs/newfs_nandfs.c	Tue Apr 19 04:57:57 2016	(r298250)
@@ -808,7 +808,7 @@ create_fs(void)
 	char *data;
 	int i;
 
-	nuserfiles = (sizeof(user_files) / sizeof(user_files[0]));
+	nuserfiles = nitems(user_files);
 
 	/* Count and assign blocks */
 	count_seg_blocks();