summaryrefslogtreecommitdiff
path: root/sys/arch/i386/stand/cdboot/conf.c
diff options
context:
space:
mode:
authorJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2010-12-06 18:44:50 +0000
committerJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2010-12-06 18:44:50 +0000
commitc35b9bdae7316474e01b5a2ba9dcf3631b975901 (patch)
treee2584f7866a69b7d5115c88c8916474d2dc7c70b /sys/arch/i386/stand/cdboot/conf.c
parentadc400522ede0d3382b10f47167d1652125bd6e6 (diff)
- drop NENTS(), which was yet another copy of nitems().
no binary change ok deraadt@
Diffstat (limited to 'sys/arch/i386/stand/cdboot/conf.c')
-rw-r--r--sys/arch/i386/stand/cdboot/conf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/i386/stand/cdboot/conf.c b/sys/arch/i386/stand/cdboot/conf.c
index 29cfb25c204..cf0261990fb 100644
--- a/sys/arch/i386/stand/cdboot/conf.c
+++ b/sys/arch/i386/stand/cdboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.13 2010/08/11 14:18:52 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.14 2010/12/06 18:44:49 jasper Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -61,10 +61,10 @@ void (*i386_probe2[])(void) = {
};
struct i386_boot_probes probe_list[] = {
- { "probing", i386_probe1, NENTS(i386_probe1) },
- { "disk", i386_probe2, NENTS(i386_probe2) },
+ { "probing", i386_probe1, nitems(i386_probe1) },
+ { "disk", i386_probe2, nitems(i386_probe2) },
};
-int nibprobes = NENTS(probe_list);
+int nibprobes = nitems(probe_list);
struct fs_ops file_system[] = {
{ ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek,
@@ -84,7 +84,7 @@ struct fs_ops file_system[] = {
null_stat, null_readdir }
#endif
};
-int nfsys = NENTS(file_system);
+int nfsys = nitems(file_system);
struct devsw devsw[] = {
#ifdef _TEST
@@ -93,7 +93,7 @@ struct devsw devsw[] = {
{ "BIOS", biosstrategy, biosopen, biosclose, biosioctl },
#endif
};
-int ndevs = NENTS(devsw);
+int ndevs = nitems(devsw);
struct consdev constab[] = {
#ifdef _TEST