de-__P()

7 files changed, 23 insertions, 24 deletions

diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 19e48cdb60e0..b2328a6643fa 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -63,7 +63,7 @@ static const char rcsid[] =
 extern int uflag;
 extern int lineno;
 
-static char *ftype __P((u_int));
+static char *ftype(u_int);
 
 #define	INDENTNAMELEN	8
 #define	LABEL \
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index 2975fb5b49a5..a7dfc67f9c72 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -79,11 +79,10 @@ static uid_t uid;
 static mode_t mode;
 static u_long flags = 0xffffffff;
 
-static int	dsort __P((const FTSENT **, const FTSENT **));
-static void	output __P((int, int *, const char *, ...)) __printflike(3, 4);
-static int	statd __P((FTS *, FTSENT *, uid_t *, gid_t *, mode_t *,
-			   u_long *));
-static void	statf __P((int, FTSENT *));
+static int	dsort(const FTSENT **, const FTSENT **);
+static void	output(int, int *, const char *, ...) __printflike(3, 4);
+static int	statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, u_long *);
+static void	statf(int, FTSENT *);
 
 void
 cwalk()
diff --git a/usr.sbin/mtree/extern.h b/usr.sbin/mtree/extern.h
index 54dafdfc97a7..08054305e91f 100644
--- a/usr.sbin/mtree/extern.h
+++ b/usr.sbin/mtree/extern.h
@@ -34,17 +34,17 @@
  * $FreeBSD$
  */
 
-int	 compare __P((char *, NODE *, FTSENT *));
-int	 crc __P((int, u_long *, u_long *));
-void	 cwalk __P((void));
-char	*flags_to_string __P((u_long));
+int	 compare(char *, NODE *, FTSENT *);
+int	 crc(int, u_long *, u_long *);
+void	 cwalk(void);
+char	*flags_to_string(u_long);
 
-char	*inotype __P((u_int));
-u_int	 parsekey __P((char *, int *));
-char	*rlink __P((char *));
-NODE	*spec __P((void));
-int	 verify __P((void));
+char	*inotype(u_int);
+u_int	 parsekey(char *, int *);
+char	*rlink(char *);
+NODE	*spec(void);
+int	 verify(void);
 
-int	 check_excludes __P((const char *, const char *));
-void	 init_excludes __P((void));
-void	 read_excludes_file __P((const char *));
+int	 check_excludes(const char *, const char *);
+void	 init_excludes(void);
+void	 read_excludes_file(const char *);
diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c
index 7721ff469dab..151a28bbda80 100644
--- a/usr.sbin/mtree/misc.c
+++ b/usr.sbin/mtree/misc.c
@@ -91,7 +91,7 @@ parsekey(name, needvaluep)
 	int *needvaluep;
 {
 	KEY *k, tmp;
-	int keycompare __P((const void *, const void *));
+	int keycompare(const void *, const void *);
 
 	tmp.name = name;
 	k = (KEY *)bsearch(&tmp, keylist, sizeof(keylist) / sizeof(KEY),
diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c
index 331e669b18ec..254c1b602bf3 100644
--- a/usr.sbin/mtree/mtree.c
+++ b/usr.sbin/mtree/mtree.c
@@ -62,7 +62,7 @@ int cflag, dflag, eflag, iflag, nflag, qflag, rflag, sflag, uflag, Uflag;
 u_int keys;
 char fullpath[MAXPATHLEN];
 
-static void usage __P((void));
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c
index 4cbf80b90f2f..cbf0f503c0ca 100644
--- a/usr.sbin/mtree/spec.c
+++ b/usr.sbin/mtree/spec.c
@@ -55,8 +55,8 @@ static const char rcsid[] =
 
 int lineno;				/* Current spec line number. */
 
-static void	 set __P((char *, NODE *));
-static void	 unset __P((char *, NODE *));
+static void	 set(char *, NODE *);
+static void	 unset(char *, NODE *);
 
 NODE *
 spec()
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index 0da0e124319a..1177f7895b88 100644
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@@ -60,8 +60,8 @@ extern int lineno;
 static NODE *root;
 static char path[MAXPATHLEN];
 
-static void	miss __P((NODE *, char *));
-static int	vwalk __P((void));
+static void	miss(NODE *, char *);
+static int	vwalk(void);
 
 int
 verify()