use MOPT_NULL

zoulasc · zoulasc · commit e237e42bf388 · 2006-10-16T03:37:43.000Z
diff --git a/sbin/mount_ados/mount_ados.c b/sbin/mount_ados/mount_ados.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_ados.c,v 1.22 2006/10/16 03:26:49 christos Exp $ */
+/* $NetBSD: mount_ados.c,v 1.23 2006/10/16 03:37:42 christos Exp $ */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mount_ados.c,v 1.22 2006/10/16 03:26:49 christos Exp $");
+__RCSID("$NetBSD: mount_ados.c,v 1.23 2006/10/16 03:37:42 christos Exp $");
 #endif /* not lint */
 
 #include <sys/cdefs.h>
@@ -61,7 +61,7 @@ __RCSID("$NetBSD: mount_ados.c,v 1.22 2006/10/16 03:26:49 christos Exp $");
 static const struct mntopt mopts[] = {
 	MOPT_STDOPTS,
 	MOPT_GETARGS,
-	{ .m_option = NULL }
+	MOPT_NULL,
 };
 
 int	mount_ados(int argc, char **argv);
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_cd9660.c,v 1.23 2006/10/16 03:27:41 christos Exp $	*/
+/*	$NetBSD: mount_cd9660.c,v 1.24 2006/10/16 03:37:42 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)mount_cd9660.c	8.7 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: mount_cd9660.c,v 1.23 2006/10/16 03:27:41 christos Exp $");
+__RCSID("$NetBSD: mount_cd9660.c,v 1.24 2006/10/16 03:37:42 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -75,7 +75,7 @@ static const struct mntopt mopts[] = {
 	{ "rrip", 1, ISOFSMNT_NORRIP, 1 },
 	{ "joliet", 1, ISOFSMNT_NOJOLIET, 1 },
 	{ "rrcaseins", 0, ISOFSMNT_RRCASEINS, 1 },
-	{ .m_option = NULL }
+	MOPT_NULL,
 };
 
 int	mount_cd9660(int argc, char **argv);
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_ext2fs.c,v 1.16 2006/10/16 03:29:06 christos Exp $	*/
+/*	$NetBSD: mount_ext2fs.c,v 1.17 2006/10/16 03:37:42 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)mount_ufs.c	8.4 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_ext2fs.c,v 1.16 2006/10/16 03:29:06 christos Exp $");
+__RCSID("$NetBSD: mount_ext2fs.c,v 1.17 2006/10/16 03:37:42 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -69,7 +69,7 @@ static const struct mntopt mopts[] = {
 	MOPT_FORCE,
 	MOPT_GETARGS,
 	MOPT_NODEVMTIME,
-	{ .m_option = NULL }
+	MOPT_NULL,
 };
 
 #ifndef MOUNT_NOMAIN
diff --git a/sbin/mount_fdesc/mount_fdesc.c b/sbin/mount_fdesc/mount_fdesc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_fdesc.c,v 1.18 2006/10/16 03:29:46 christos Exp $	*/
+/*	$NetBSD: mount_fdesc.c,v 1.19 2006/10/16 03:37:42 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -77,7 +77,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)mount_fdesc.c	8.3 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_fdesc.c,v 1.18 2006/10/16 03:29:46 christos Exp $");
+__RCSID("$NetBSD: mount_fdesc.c,v 1.19 2006/10/16 03:37:42 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -95,7 +95,7 @@ __RCSID("$NetBSD: mount_fdesc.c,v 1.18 2006/10/16 03:29:46 christos Exp $");
 static const struct mntopt mopts[] = {
 	MOPT_STDOPTS,
 	MOPT_GETARGS,
-	{ .m_option = NULL }
+	MOPT_NULL,
 };
 
 static void	usage(void);
diff --git a/sbin/mount_ffs/mount_ffs.c b/sbin/mount_ffs/mount_ffs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_ffs.c,v 1.19 2006/03/21 21:11:41 christos Exp $	*/
+/*	$NetBSD: mount_ffs.c,v 1.20 2006/10/16 03:37:42 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)mount_ufs.c	8.4 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_ffs.c,v 1.19 2006/03/21 21:11:41 christos Exp $");
+__RCSID("$NetBSD: mount_ffs.c,v 1.20 2006/10/16 03:37:42 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -71,7 +71,7 @@ static const struct mntopt mopts[] = {
 	MOPT_FORCE,
 	MOPT_SOFTDEP,
 	MOPT_GETARGS,
-	{ NULL }
+	MOPT_NULL,
 };
 
 #ifndef MOUNT_NOMAIN
diff --git a/sbin/mount_filecore/mount_filecore.c b/sbin/mount_filecore/mount_filecore.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_filecore.c,v 1.13 2006/03/21 21:11:41 christos Exp $ */
+/* $NetBSD: mount_filecore.c,v 1.14 2006/10/16 03:37:42 christos Exp $ */
 
 /*
  * Copyright (c) 1992, 1993, 1994 The Regents of the University of California.
@@ -101,7 +101,7 @@ static const struct mntopt mopts[] = {
 	MOPT_STDOPTS,
 	MOPT_UPDATE,
 	MOPT_GETARGS,
-	{ NULL }
+	MOPT_NULL,
 };
 
 int	mount_filecore(int argc, char **argv);
diff --git a/sbin/mount_kernfs/mount_kernfs.c b/sbin/mount_kernfs/mount_kernfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_kernfs.c,v 1.18 2006/03/21 21:11:41 christos Exp $	*/
+/*	$NetBSD: mount_kernfs.c,v 1.19 2006/10/16 03:37:42 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -77,7 +77,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)mount_kernfs.c	8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: mount_kernfs.c,v 1.18 2006/03/21 21:11:41 christos Exp $");
+__RCSID("$NetBSD: mount_kernfs.c,v 1.19 2006/10/16 03:37:42 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -95,7 +95,7 @@ __RCSID("$NetBSD: mount_kernfs.c,v 1.18 2006/03/21 21:11:41 christos Exp $");
 static const struct mntopt mopts[] = {
 	MOPT_STDOPTS,
 	MOPT_GETARGS,
-	{ NULL }
+	MOPT_NULL,
 };
 
 int	mount_kernfs(int argc, char **argv);
diff --git a/sbin/mount_lfs/mount_lfs.c b/sbin/mount_lfs/mount_lfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_lfs.c,v 1.27 2006/03/21 21:11:41 christos Exp $	*/
+/*	$NetBSD: mount_lfs.c,v 1.28 2006/10/16 03:37:42 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)mount_lfs.c	8.4 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_lfs.c,v 1.27 2006/03/21 21:11:41 christos Exp $");
+__RCSID("$NetBSD: mount_lfs.c,v 1.28 2006/10/16 03:37:42 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -66,7 +66,7 @@ static const struct mntopt mopts[] = {
 	MOPT_UPDATE,
 	MOPT_GETARGS,
 	MOPT_NOATIME,
-	{ NULL }
+	MOPT_NULL,
 };
 
 int		mount_lfs(int, char *[]);
diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_msdos.c,v 1.38 2006/03/21 21:11:41 christos Exp $ */
+/* $NetBSD: mount_msdos.c,v 1.39 2006/10/16 03:37:42 christos Exp $ */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mount_msdos.c,v 1.38 2006/03/21 21:11:41 christos Exp $");
+__RCSID("$NetBSD: mount_msdos.c,v 1.39 2006/10/16 03:37:42 christos Exp $");
 #endif /* not lint */
 
 #include <sys/cdefs.h>
@@ -64,7 +64,7 @@ static const struct mntopt mopts[] = {
 	MOPT_SYNC,
 	MOPT_UPDATE,
 	MOPT_GETARGS,
-	{ NULL }
+	MOPT_NULL,
 };
 
 int	mount_msdos(int argc, char **argv);
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_nfs.c,v 1.51 2006/05/20 08:06:48 yamt Exp $	*/
+/*	$NetBSD: mount_nfs.c,v 1.52 2006/10/16 03:37:42 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)mount_nfs.c	8.11 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: mount_nfs.c,v 1.51 2006/05/20 08:06:48 yamt Exp $");
+__RCSID("$NetBSD: mount_nfs.c,v 1.52 2006/10/16 03:37:42 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -134,7 +134,7 @@ static const struct mntopt mopts[] = {
 	{ "readahead", 0, ALTF_READAHEAD, 1 },
 	{ "deadthresh", 0, ALTF_DEADTHRESH, 1 },
 	{ "timeo", 0, ALTF_TIMEO, 1 },
-	{ NULL }
+	MOPT_NULL,
 
 };
 
diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_ntfs.c,v 1.14 2006/03/21 21:11:41 christos Exp $ */
+/* $NetBSD: mount_ntfs.c,v 1.15 2006/10/16 03:37:42 christos Exp $ */
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mount_ntfs.c,v 1.14 2006/03/21 21:11:41 christos Exp $");
+__RCSID("$NetBSD: mount_ntfs.c,v 1.15 2006/10/16 03:37:42 christos Exp $");
 #endif
 
 #include <sys/cdefs.h>
@@ -60,7 +60,7 @@ __RCSID("$NetBSD: mount_ntfs.c,v 1.14 2006/03/21 21:11:41 christos Exp $");
 static const struct mntopt mopts[] = {
 	MOPT_STDOPTS,
 	MOPT_GETARGS,
-	{ NULL }
+	MOPT_NULL,
 };
 
 static void	usage(void) __attribute__((__noreturn__));
diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_null.c,v 1.14 2006/03/21 21:11:41 christos Exp $	*/
+/*	$NetBSD: mount_null.c,v 1.15 2006/10/16 03:37:43 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)mount_null.c	8.6 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_null.c,v 1.14 2006/03/21 21:11:41 christos Exp $");
+__RCSID("$NetBSD: mount_null.c,v 1.15 2006/10/16 03:37:43 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -61,7 +61,7 @@ __RCSID("$NetBSD: mount_null.c,v 1.14 2006/03/21 21:11:41 christos Exp $");
 static const struct mntopt mopts[] = {
 	MOPT_STDOPTS,
 	MOPT_GETARGS,
-	{ NULL }
+	MOPT_NULL,
 };
 
 int	mount_null(int argc, char **argv);
diff --git a/sbin/mount_overlay/mount_overlay.c b/sbin/mount_overlay/mount_overlay.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_overlay.c,v 1.8 2006/03/21 21:11:41 christos Exp $	*/
+/*	$NetBSD: mount_overlay.c,v 1.9 2006/10/16 03:37:43 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)mount_null.c	8.6 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_overlay.c,v 1.8 2006/03/21 21:11:41 christos Exp $");
+__RCSID("$NetBSD: mount_overlay.c,v 1.9 2006/10/16 03:37:43 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -61,7 +61,7 @@ __RCSID("$NetBSD: mount_overlay.c,v 1.8 2006/03/21 21:11:41 christos Exp $");
 static const struct mntopt mopts[] = {
 	MOPT_STDOPTS,
 	MOPT_GETARGS,
-	{ NULL }
+	MOPT_NULL,
 };
 
 int	mount_overlay(int argc, char **argv);
diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_portal.c,v 1.29 2006/05/09 20:18:08 mrg Exp $	*/
+/*	$NetBSD: mount_portal.c,v 1.30 2006/10/16 03:37:43 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)mount_portal.c	8.6 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_portal.c,v 1.29 2006/05/09 20:18:08 mrg Exp $");
+__RCSID("$NetBSD: mount_portal.c,v 1.30 2006/10/16 03:37:43 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -70,7 +70,7 @@ __RCSID("$NetBSD: mount_portal.c,v 1.29 2006/05/09 20:18:08 mrg Exp $");
 static const struct mntopt mopts[] = {
 	MOPT_STDOPTS,
 	MOPT_GETARGS,
-	{ NULL }
+	MOPT_NULL,
 };
 
 static char mountpt[MAXPATHLEN];  /* made available to signal handler */
diff --git a/sbin/mount_procfs/mount_procfs.c b/sbin/mount_procfs/mount_procfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_procfs.c,v 1.18 2006/03/21 21:11:42 christos Exp $	*/
+/*	$NetBSD: mount_procfs.c,v 1.19 2006/10/16 03:37:43 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -77,7 +77,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)mount_procfs.c	8.4 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_procfs.c,v 1.18 2006/03/21 21:11:42 christos Exp $");
+__RCSID("$NetBSD: mount_procfs.c,v 1.19 2006/10/16 03:37:43 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -99,7 +99,7 @@ static const struct mntopt mopts[] = {
 	MOPT_STDOPTS,
 	MOPT_GETARGS,
 	{ "linux", 0, PROCFSMNT_LINUXCOMPAT, 1},
-	{ NULL }
+	MOPT_NULL,
 };
 
 int	mount_procfs(int argc, char **argv);
diff --git a/sbin/mount_ptyfs/mount_ptyfs.c b/sbin/mount_ptyfs/mount_ptyfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_ptyfs.c,v 1.5 2006/03/21 21:11:42 christos Exp $	*/
+/*	$NetBSD: mount_ptyfs.c,v 1.6 2006/10/16 03:37:43 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -77,7 +77,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)mount_ptyfs.c	8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: mount_ptyfs.c,v 1.5 2006/03/21 21:11:42 christos Exp $");
+__RCSID("$NetBSD: mount_ptyfs.c,v 1.6 2006/10/16 03:37:43 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -105,7 +105,7 @@ static const struct mntopt mopts[] = {
 	MOPT_GETARGS,
 	{ "group", 0, ALTF_GROUP, 1 },
 	{ "mode", 0, ALTF_MODE, 1 },
-	{ NULL }
+	MOPT_NULL,
 };
 
 int	main(int, char *[]);
diff --git a/sbin/mount_sysvbfs/mount_sysvbfs.c b/sbin/mount_sysvbfs/mount_sysvbfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mount_sysvbfs.c,v 1.2 2006/03/21 21:11:42 christos Exp $	*/
+/*	$NetBSD: mount_sysvbfs.c,v 1.3 2006/10/16 03:37:43 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -36,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993, 1994\n\
 #endif /* not lint */
 
 #ifndef lint
-__RCSID("$NetBSD: mount_sysvbfs.c,v 1.2 2006/03/21 21:11:42 christos Exp $");
+__RCSID("$NetBSD: mount_sysvbfs.c,v 1.3 2006/10/16 03:37:43 christos Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -60,7 +60,7 @@ static const struct mntopt mopts[] = {
 	MOPT_STDOPTS,
 	MOPT_UPDATE,
 	MOPT_GETARGS,
-	{ NULL }
+	MOPT_NULL,
 };
 
 #ifndef MOUNT_NOMAIN
diff --git a/sbin/mount_tmpfs/mount_tmpfs.c b/sbin/mount_tmpfs/mount_tmpfs.c
diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c
diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c
diff --git a/sbin/mount_union/mount_union.c b/sbin/mount_union/mount_union.c
