summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sbin/mount/mntopts.h3
-rw-r--r--sbin/mount/mount_ufs.c2
-rw-r--r--sbin/mount_cd9660/mount_cd9660.c2
-rw-r--r--sbin/mount_ext2fs/mount_ext2fs.c2
-rw-r--r--sbin/mount_hpfs/mount_hpfs.c2
-rw-r--r--sbin/mount_msdosfs/mount_msdosfs.c2
-rw-r--r--sbin/mount_nfs/mount_nfs.c2
-rw-r--r--sbin/mount_nfs4/mount_nfs4.c2
-rw-r--r--sbin/mount_ntfs/mount_ntfs.c2
-rw-r--r--sbin/mount_nullfs/mount_nullfs.c2
-rw-r--r--sbin/mount_reiserfs/mount_reiserfs.c2
-rw-r--r--sbin/mount_std/mount_std.c2
-rw-r--r--sbin/mount_udf/mount_udf.c2
-rw-r--r--sbin/mount_ufs/mount_ufs.c2
-rw-r--r--sbin/mount_umapfs/mount_umapfs.c2
-rw-r--r--sbin/mount_unionfs/mount_unionfs.c2
16 files changed, 18 insertions, 15 deletions
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 5205195..8b8e1fb 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -65,6 +65,9 @@ struct mntopt {
/* This is parsed by mount(8), but is ignored by specific mount_*(8)s. */
#define MOPT_AUTO { "auto", 0, 0, 0 }
+/* A handy macro as terminator of MNT_ array */
+#define MOPT_NULL { NULL, 0, 0, 0 }
+
#define MOPT_FSTAB_COMPAT \
MOPT_RO, \
MOPT_RW, \
diff --git a/sbin/mount/mount_ufs.c b/sbin/mount/mount_ufs.c
index ff1c126..e18247b 100644
--- a/sbin/mount/mount_ufs.c
+++ b/sbin/mount/mount_ufs.c
@@ -64,7 +64,7 @@ static struct mntopt mopts[] = {
MOPT_SYNC,
MOPT_UPDATE,
MOPT_SNAPSHOT,
- { NULL }
+ MOPT_NULL
};
int
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index a1a11f9..4a6461a 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -77,7 +77,7 @@ struct mntopt mopts[] = {
{ "rrip", 1, ISOFSMNT_NORRIP, 1 },
{ "joliet", 1, ISOFSMNT_NOJOLIET, 1 },
{ "strictjoliet", 1, ISOFSMNT_BROKENJOLIET, 1 },
- { NULL }
+ MOPT_NULL
};
int get_ssector(const char *dev);
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index 4c7c401..a74a5d7 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -60,7 +60,7 @@ struct mntopt mopts[] = {
MOPT_FORCE,
MOPT_SYNC,
MOPT_UPDATE,
- { NULL }
+ MOPT_NULL
};
static void usage(void) __dead2;
diff --git a/sbin/mount_hpfs/mount_hpfs.c b/sbin/mount_hpfs/mount_hpfs.c
index 95986f1..150dfd1 100644
--- a/sbin/mount_hpfs/mount_hpfs.c
+++ b/sbin/mount_hpfs/mount_hpfs.c
@@ -50,7 +50,7 @@
static struct mntopt mopts[] = {
MOPT_STDOPTS,
- { NULL }
+ MOPT_NULL
};
static gid_t a_gid(char *);
diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c
index 58551d3..d5557bb 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.c
+++ b/sbin/mount_msdosfs/mount_msdosfs.c
@@ -73,7 +73,7 @@ static struct mntopt mopts[] = {
{ "shortnames", 0, MSDOSFSMNT_SHORTNAME, 1 },
{ "longnames", 0, MSDOSFSMNT_LONGNAME, 1 },
{ "nowin95", 0, MSDOSFSMNT_NOWIN95, 1 },
- { NULL }
+ MOPT_NULL
};
static gid_t a_gid(char *);
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 0e99577..4af2d65 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -121,7 +121,7 @@ struct mntopt mopts[] = {
{ "lockd", 1, ALTF_NOLOCKD, 1 },
{ "inet4", 1, ALTF_NOINET4, 1 },
{ "inet6", 1, ALTF_NOINET6, 1 },
- { NULL }
+ MOPT_NULL
};
struct nfs_args nfsdefargs = {
diff --git a/sbin/mount_nfs4/mount_nfs4.c b/sbin/mount_nfs4/mount_nfs4.c
index b1ad123..683fb93 100644
--- a/sbin/mount_nfs4/mount_nfs4.c
+++ b/sbin/mount_nfs4/mount_nfs4.c
@@ -151,7 +151,7 @@ struct mntopt mopts[] = {
{ "lockd", 1, ALTF_NOLOCKD, 1 },
{ "inet4", 1, ALTF_NOINET4, 1 },
{ "inet6", 1, ALTF_NOINET6, 1 },
- { NULL }
+ MOPT_NULL
};
struct nfs_args nfsdefargs = {
diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c
index 54bb38e..49db87d 100644
--- a/sbin/mount_ntfs/mount_ntfs.c
+++ b/sbin/mount_ntfs/mount_ntfs.c
@@ -58,7 +58,7 @@
static struct mntopt mopts[] = {
MOPT_STDOPTS,
- { NULL }
+ MOPT_NULL
};
static gid_t a_gid(char *);
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
index 0c947a9..8fefe16 100644
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
@@ -59,7 +59,7 @@ static const char rcsid[] =
struct mntopt mopts[] = {
MOPT_STDOPTS,
- { NULL }
+ MOPT_NULL
};
int subdir(const char *, const char *);
diff --git a/sbin/mount_reiserfs/mount_reiserfs.c b/sbin/mount_reiserfs/mount_reiserfs.c
index 90f8731..34dc463 100644
--- a/sbin/mount_reiserfs/mount_reiserfs.c
+++ b/sbin/mount_reiserfs/mount_reiserfs.c
@@ -41,7 +41,7 @@
struct mntopt mopts[] = {
MOPT_STDOPTS,
- { NULL }
+ MOPT_NULL
};
void usage(void);
diff --git a/sbin/mount_std/mount_std.c b/sbin/mount_std/mount_std.c
index 11f42c1..601cab4 100644
--- a/sbin/mount_std/mount_std.c
+++ b/sbin/mount_std/mount_std.c
@@ -59,7 +59,7 @@ static const char rcsid[] =
static struct mntopt mopts[] = {
MOPT_STDOPTS,
- { NULL }
+ MOPT_NULL
};
static char *fsname;
diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c
index 080fab8..4c8dbef 100644
--- a/sbin/mount_udf/mount_udf.c
+++ b/sbin/mount_udf/mount_udf.c
@@ -64,7 +64,7 @@
struct mntopt mopts[] = {
MOPT_STDOPTS,
MOPT_UPDATE,
- { NULL, 0, 0, 0 }
+ MOPT_NULL
};
int set_charset(char **, char **, const char *);
diff --git a/sbin/mount_ufs/mount_ufs.c b/sbin/mount_ufs/mount_ufs.c
index ff8ab9d..6043b1f 100644
--- a/sbin/mount_ufs/mount_ufs.c
+++ b/sbin/mount_ufs/mount_ufs.c
@@ -61,7 +61,7 @@ struct mntopt mopts[] = {
MOPT_SYNC,
MOPT_UPDATE,
MOPT_SNAPSHOT,
- { NULL }
+ MOPT_NULL
};
void usage(void);
diff --git a/sbin/mount_umapfs/mount_umapfs.c b/sbin/mount_umapfs/mount_umapfs.c
index c7315be..eb932fa 100644
--- a/sbin/mount_umapfs/mount_umapfs.c
+++ b/sbin/mount_umapfs/mount_umapfs.c
@@ -79,7 +79,7 @@ static const char rcsid[] =
static struct mntopt mopts[] = {
MOPT_STDOPTS,
- { NULL }
+ MOPT_NULL
};
static void usage(void) __dead2;
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index 6d67bef..9c541c6 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -60,7 +60,7 @@ static const char rcsid[] =
static struct mntopt mopts[] = {
MOPT_STDOPTS,
- { NULL }
+ MOPT_NULL
};
static int subdir(const char *, const char *);
OpenPOWER on IntegriCloud