summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraraujo <araujo@FreeBSD.org>2016-04-19 04:57:57 +0000
committeraraujo <araujo@FreeBSD.org>2016-04-19 04:57:57 +0000
commitd6cc304ba6d23235c0aaebe0b2e6bbf49f5ea7d4 (patch)
treeeabf47091587a3849b70ecba40939b6a1eba464c
parentf3d1782e9ef259f21f76edc94e70164aafd0a4b5 (diff)
downloadFreeBSD-src-d6cc304ba6d23235c0aaebe0b2e6bbf49f5ea7d4.zip
FreeBSD-src-d6cc304ba6d23235c0aaebe0b2e6bbf49f5ea7d4.tar.gz
Use nitems() from sys/param.h.
MFC after: 2 weeks.
-rw-r--r--sbin/newfs_msdos/mkfs_msdos.c2
-rw-r--r--sbin/newfs_nandfs/newfs_nandfs.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c
index 0f72a85..90d7df8 100644
--- a/sbin/newfs_msdos/mkfs_msdos.c
+++ b/sbin/newfs_msdos/mkfs_msdos.c
@@ -760,7 +760,7 @@ getstdfmt(const char *fmt, struct bpb *bpb)
{
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);
diff --git a/sbin/newfs_nandfs/newfs_nandfs.c b/sbin/newfs_nandfs/newfs_nandfs.c
index 9500805..8ec285d 100644
--- a/sbin/newfs_nandfs/newfs_nandfs.c
+++ b/sbin/newfs_nandfs/newfs_nandfs.c
@@ -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();
OpenPOWER on IntegriCloud