Remove __P() usage.

13 files changed, 21 insertions, 21 deletions

diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c
index 5ee24bc..1088896 100644
--- a/lib/libc/stdlib/bsearch.c
+++ b/lib/libc/stdlib/bsearch.c
@@ -62,7 +62,7 @@ bsearch(key, base0, nmemb, size, compar)
 	const void *base0;
 	size_t nmemb;
 	size_t size;
-	int (*compar) __P((const void *, const void *));
+	int (*compar)(const void *, const void *);
 {
 	const char *base = base0;
 	size_t lim;
diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c
index 24683f3..1643db0 100644
--- a/lib/libc/stdlib/getenv.c
+++ b/lib/libc/stdlib/getenv.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <stddef.h>
 #include <string.h>
 
-inline char *__findenv __P((const char *, int *));
+inline char *__findenv(const char *, int *);
 
 /*
  * __findenv --
diff --git a/lib/libc/stdlib/heapsort.c b/lib/libc/stdlib/heapsort.c
index 89e9592..d37d199 100644
--- a/lib/libc/stdlib/heapsort.c
+++ b/lib/libc/stdlib/heapsort.c
@@ -143,7 +143,7 @@ int
 heapsort(vbase, nmemb, size, compar)
 	void *vbase;
 	size_t nmemb, size;
-	int (*compar) __P((const void *, const void *));
+	int (*compar)(const void *, const void *);
 {
 	int cnt, i, j, l;
 	char tmp, *tmp1, *tmp2;
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 7998acc..463bbfc 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -250,7 +250,7 @@ static int malloc_utrace;
 
 struct ut { void *p; size_t s; void *r; };
 
-void utrace __P((struct ut *, int));
+void utrace(struct ut *, int);
 
 #define UTRACE(a, b, c) \
 	if (malloc_utrace) \
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
index 2fb1f3a..f03bb3d 100644
--- a/lib/libc/stdlib/merge.c
+++ b/lib/libc/stdlib/merge.c
@@ -60,8 +60,8 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 
-static void setup __P((u_char *, u_char *, size_t, size_t, int (*)()));
-static void insertionsort __P((u_char *, size_t, size_t, int (*)()));
+static void setup(u_char *, u_char *, size_t, size_t, int (*)());
+static void insertionsort(u_char *, size_t, size_t, int (*)());
 
 #define ISIZE sizeof(int)
 #define PSIZE sizeof(u_char *)
@@ -101,7 +101,7 @@ mergesort(base, nmemb, size, cmp)
 	void *base;
 	size_t nmemb;
 	size_t size;
-	int (*cmp) __P((const void *, const void *));
+	int (*cmp)(const void *, const void *);
 {
 	int i, sense;
 	int big, iflag;
@@ -262,7 +262,7 @@ COPY:	    			b = t;
 void
 setup(list1, list2, n, size, cmp)
 	size_t n, size;
-	int (*cmp) __P((const void *, const void *));
+	int (*cmp)(const void *, const void *);
 	u_char *list1, *list2;
 {
 	int i, length, size2, tmp, sense;
@@ -337,7 +337,7 @@ static void
 insertionsort(a, n, size, cmp)
 	u_char *a;
 	size_t n, size;
-	int (*cmp) __P((const void *, const void *));
+	int (*cmp)(const void *, const void *);
 {
 	u_char *ai, *s, *t, *u, tmp;
 	int i;
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index 71d9dc9..11dd937 100644
--- a/lib/libc/stdlib/qsort.c
+++ b/lib/libc/stdlib/qsort.c
@@ -41,9 +41,9 @@ static const char rcsid[] =
 
 #include <stdlib.h>
 
-typedef int		 cmp_t __P((const void *, const void *));
-static inline char	*med3 __P((char *, char *, char *, cmp_t *));
-static inline void	 swapfunc __P((char *, char *, int, int));
+typedef int		 cmp_t(const void *, const void *);
+static inline char	*med3(char *, char *, char *, cmp_t *);
+static inline void	 swapfunc(char *, char *, int, int);
 
 #define min(a, b)	(a) < (b) ? a : b
 
diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c
index 873c7ec..9540f63 100644
--- a/lib/libc/stdlib/radixsort.c
+++ b/lib/libc/stdlib/radixsort.c
@@ -64,8 +64,8 @@ typedef struct {
 } stack;
 
 static inline void simplesort
-	    __P((const u_char **, int, int, const u_char *, u_int));
-static void r_sort_a __P((const u_char **, int, int, const u_char *, u_int));
+(const u_char **, int, int, const u_char *, u_int);
+static void r_sort_a(const u_char **, int, int, const u_char *, u_int);
 static void r_sort_b __P((const u_char **,
 	    const u_char **, int, int, const u_char *, u_int));
 
diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c
index be12368..9db04aa 100644
--- a/lib/libc/stdlib/random.c
+++ b/lib/libc/stdlib/random.c
@@ -214,7 +214,7 @@ static long rand_deg = DEG_3;
 static long rand_sep = SEP_3;
 static long *end_ptr = &randtbl[DEG_3 + 1];
 
-static inline long good_rand __P((long));
+static inline long good_rand(long);
 
 static inline long good_rand (x)
 	long x;
diff --git a/lib/libc/stdlib/setenv.c b/lib/libc/stdlib/setenv.c
index ef10810..e1de805 100644
--- a/lib/libc/stdlib/setenv.c
+++ b/lib/libc/stdlib/setenv.c
@@ -42,7 +42,7 @@ static const char rcsid[] = "$FreeBSD$";
 #include <stdlib.h>
 #include <string.h>
 
-char *__findenv __P((const char *, int *));
+char *__findenv(const char *, int *);
 
 /*
  * setenv --
diff --git a/lib/libc/stdlib/tdelete.c b/lib/libc/stdlib/tdelete.c
index daf4aa7..339405a 100644
--- a/lib/libc/stdlib/tdelete.c
+++ b/lib/libc/stdlib/tdelete.c
@@ -28,7 +28,7 @@ void *
 tdelete(vkey, vrootp, compar)
 	const void *vkey;	/* key to be deleted */
 	void      **vrootp;	/* address of the root of tree */
-	int       (*compar) __P((const void *, const void *));
+	int       (*compar)(const void *, const void *);
 {
 	node_t **rootp = (node_t **)vrootp;
 	node_t *p, *q, *r;
diff --git a/lib/libc/stdlib/tfind.c b/lib/libc/stdlib/tfind.c
index b2c4b96..c2e3d77 100644
--- a/lib/libc/stdlib/tfind.c
+++ b/lib/libc/stdlib/tfind.c
@@ -27,7 +27,7 @@ void *
 tfind(vkey, vrootp, compar)
 	const void *vkey;		/* key to be found */
 	void **vrootp;			/* address of the tree root */
-	int (*compar) __P((const void *, const void *));
+	int (*compar)(const void *, const void *);
 {
 	node_t **rootp = (node_t **)vrootp;
 
diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c
index 85832ce..e842ff4 100644
--- a/lib/libc/stdlib/tsearch.c
+++ b/lib/libc/stdlib/tsearch.c
@@ -27,7 +27,7 @@ void *
 tsearch(vkey, vrootp, compar)
 	const void *vkey;		/* key to be located */
 	void **vrootp;			/* address of tree root */
-	int (*compar) __P((const void *, const void *));
+	int (*compar)(const void *, const void *);
 {
 	node_t *q;
 	node_t **rootp = (node_t **)vrootp;
diff --git a/lib/libc/stdlib/twalk.c b/lib/libc/stdlib/twalk.c
index eab71df..78d3685 100644
--- a/lib/libc/stdlib/twalk.c
+++ b/lib/libc/stdlib/twalk.c
@@ -29,7 +29,7 @@ static void trecurse __P((const node_t *,
 static void
 trecurse(root, action, level)
 	const node_t *root;	/* Root of the tree to be walked */
-	void (*action) __P((const void *, VISIT, int));
+	void (*action)(const void *, VISIT, int);
 	int level;
 {
 
@@ -50,7 +50,7 @@ trecurse(root, action, level)
 void
 twalk(vroot, action)
 	const void *vroot;	/* Root of the tree to be walked */
-	void (*action) __P((const void *, VISIT, int));
+	void (*action)(const void *, VISIT, int);
 {
 	if (vroot != NULL && action != NULL)
 		trecurse(vroot, action, 0);