o __P removed

o main prototype removed

4 files changed, 21 insertions, 22 deletions

diff --git a/sbin/mount/extern.h b/sbin/mount/extern.h
index bc11a037ecfd..638f8a4a1eb2 100644
--- a/sbin/mount/extern.h
+++ b/sbin/mount/extern.h
@@ -27,8 +27,8 @@
  */
 
 /* vfslist.c */
-int checkvfsname __P((const char *, const char **));
-const char **makevfslist __P((char *));
+int checkvfsname(const char *, const char **);
+const char **makevfslist(char *);
 
 /* mount_ufs.c */
-int mount_ufs __P((int, char *const *));
+int mount_ufs(int, char *const *);
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index a30a707306e8..8ff13f7940ac 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -88,7 +88,7 @@ struct mntopt {
 	MOPT_NOCLUSTERR,						\
 	MOPT_NOCLUSTERW
 
-void getmntopts __P((const char *, const struct mntopt *, int *, int *));
-void rmslashes __P((char *, char *));
-void checkpath __P((const char *, char resolved_path[]));
+void getmntopts(const char *, const struct mntopt *, int *, int *);
+void rmslashes(char *, char *);
+void checkpath(const char *, char resolved_path[]);
 extern int getmnt_silent;
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 9648eaaad2fb..3494d9cd0269 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -70,21 +70,20 @@ static const char rcsid[] =
 
 int debug, fstab_style, verbose;
 
-char   *catopt __P((char *, const char *));
-struct statfs
-       *getmntpt __P((const char *));
-int	hasopt __P((const char *, const char *));
-int	ismounted __P((struct fstab *, struct statfs *, int));
-int	isremountable __P((const char *));
-void	mangle __P((char *, int *, const char **));
-char   *update_options __P((char *, char *, int));
-int	mountfs __P((const char *, const char *, const char *,
-			int, const char *, const char *));
-void	remopt __P((char *, const char *));
-void	prmount __P((struct statfs *));
-void	putfsent __P((const struct statfs *));
-void	usage __P((void));
-char   *flags2opts __P((int));
+char   *catopt(char *, const char *);
+struct statfs *getmntpt(const char *);
+int	hasopt(const char *, const char *);
+int	ismounted(struct fstab *, struct statfs *, int);
+int	isremountable(const char *);
+void	mangle(char *, int *, const char **);
+char   *update_options(char *, char *, int);
+int	mountfs(const char *, const char *, const char *,
+			int, const char *, const char *);
+void	remopt(char *, const char *);
+void	prmount(struct statfs *);
+void	putfsent(const struct statfs *);
+void	usage(void);
+char   *flags2opts(int);
 
 /* Map from mount options to printable formats. */
 static struct opt {
diff --git a/sbin/mount/mount_ufs.c b/sbin/mount/mount_ufs.c
index 8c626dbf8280..dee0ddf5db88 100644
--- a/sbin/mount/mount_ufs.c
+++ b/sbin/mount/mount_ufs.c
@@ -59,7 +59,7 @@ static const char rcsid[] =
 #include "extern.h"
 #include "mntopts.h"
 
-static void ufs_usage __P((void));
+static void ufs_usage(void);
 
 static struct mntopt mopts[] = {
 	MOPT_STDOPTS,