Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

8 files changed, 57 insertions, 57 deletions

diff --git a/regress/lib/libc/db/dbtest.c b/regress/lib/libc/db/dbtest.c
index 63e80524ec5..9f4da588006 100644
--- a/regress/lib/libc/db/dbtest.c
+++ b/regress/lib/libc/db/dbtest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dbtest.c,v 1.6 2001/01/29 02:05:40 niklas Exp $	*/
+/*	$OpenBSD: dbtest.c,v 1.7 2002/02/16 21:27:32 millert Exp $	*/
 /*	$NetBSD: dbtest.c,v 1.8 1996/05/03 21:57:48 cgd Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)dbtest.c	8.17 (Berkeley) 9/1/94";
 #else
-static char rcsid[] = "$OpenBSD: dbtest.c,v 1.6 2001/01/29 02:05:40 niklas Exp $";
+static char rcsid[] = "$OpenBSD: dbtest.c,v 1.7 2002/02/16 21:27:32 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -64,22 +64,22 @@ static char rcsid[] = "$OpenBSD: dbtest.c,v 1.6 2001/01/29 02:05:40 niklas Exp $
 
 enum S { COMMAND, COMPARE, GET, PUT, REMOVE, SEQ, SEQFLAG, KEY, DATA };
 
-void	 compare __P((DBT *, DBT *));
-DBTYPE	 dbtype __P((char *));
-void	 dump __P((DB *, int));
-void	 err __P((const char *, ...));
-void	 get __P((DB *, DBT *));
-void	 getdata __P((DB *, DBT *, DBT *));
-void	 put __P((DB *, DBT *, DBT *));
-void	 rem __P((DB *, DBT *));
-char	*sflags __P((int));
-void	 synk __P((DB *));
-void	*rfile __P((char *, size_t *));
-void	 seq __P((DB *, DBT *));
-u_int	 setflags __P((char *));
-void	*setinfo __P((DBTYPE, char *));
-void	 usage __P((void));
-void	*xmalloc __P((char *, size_t));
+void	 compare(DBT *, DBT *);
+DBTYPE	 dbtype(char *);
+void	 dump(DB *, int);
+void	 err(const char *, ...);
+void	 get(DB *, DBT *);
+void	 getdata(DB *, DBT *, DBT *);
+void	 put(DB *, DBT *, DBT *);
+void	 rem(DB *, DBT *);
+char	*sflags(int);
+void	 synk(DB *);
+void	*rfile(char *, size_t *);
+void	 seq(DB *, DBT *);
+u_int	 setflags(char *);
+void	*setinfo(DBTYPE, char *);
+void	 usage(void);
+void	*xmalloc(char *, size_t);
 
 DBTYPE type;				/* Database type. */
 void *infop;				/* Iflags. */
diff --git a/regress/lib/libc/regex/debug.ih b/regress/lib/libc/regex/debug.ih
index 2aa04490389..9eb313af238 100644
--- a/regress/lib/libc/regex/debug.ih
+++ b/regress/lib/libc/regex/debug.ih
@@ -1,4 +1,4 @@
-/*	$OpenBSD: debug.ih,v 1.2 2001/01/29 02:05:44 niklas Exp $	*/
+/*	$OpenBSD: debug.ih,v 1.3 2002/02/16 21:27:32 millert Exp $	*/
 /*	$NetBSD: debug.ih,v 1.2 1995/04/20 22:39:47 cgd Exp $	*/
 
 /* ========= begin header generated by ./mkh ========= */
@@ -7,9 +7,9 @@ extern "C" {
 #endif
 
 /* === debug.c === */
-void regprint __P((regex_t *r, FILE *d));
-static void s_print __P((register struct re_guts *g, FILE *d));
-static char *regchar __P((int ch));
+void regprint(regex_t *r, FILE *d);
+static void s_print(register struct re_guts *g, FILE *d);
+static char *regchar(int ch);
 
 #ifdef __cplusplus
 }
diff --git a/regress/lib/libc/regex/main.ih b/regress/lib/libc/regex/main.ih
index 9e3246889e6..0860e263331 100644
--- a/regress/lib/libc/regex/main.ih
+++ b/regress/lib/libc/regex/main.ih
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.ih,v 1.2 2001/01/29 02:05:44 niklas Exp $	*/
+/*	$OpenBSD: main.ih,v 1.3 2002/02/16 21:27:32 millert Exp $	*/
 /*	$NetBSD: main.ih,v 1.2 1995/04/20 22:39:55 cgd Exp $	*/
 
 /* ========= begin header generated by ./mkh ========= */
@@ -7,14 +7,14 @@ extern "C" {
 #endif
 
 /* === main.c === */
-void regress __P((FILE *in));
-void try __P((char *f0, char *f1, char *f2, char *f3, char *f4, int opts));
-int options __P((int type, char *s));
-int opt __P((int c, char *s));
-void fixstr __P((register char *p));
-char *check __P((char *str, regmatch_t sub, char *should));
-static char *eprint __P((int err));
-static int efind __P((char *name));
+void regress(FILE *in);
+void try(char *f0, char *f1, char *f2, char *f3, char *f4, int opts);
+int options(int type, char *s);
+int opt(int c, char *s);
+void fixstr(register char *p);
+char *check(char *str, regmatch_t sub, char *should);
+static char *eprint(int err);
+static int efind(char *name);
 
 #ifdef __cplusplus
 }
diff --git a/regress/lib/libc_r/include/test.h b/regress/lib/libc_r/include/test.h
index c66291c2166..32798c2d1df 100644
--- a/regress/lib/libc_r/include/test.h
+++ b/regress/lib/libc_r/include/test.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: test.h,v 1.2 2001/09/20 15:33:17 todd Exp $	*/
+/*	$OpenBSD: test.h,v 1.3 2002/02/16 21:27:32 millert Exp $	*/
 
 #ifndef _h_test_
 #define _h_test_
@@ -9,8 +9,8 @@
 #include <string.h>
 #include <stdarg.h>
 
-int	_thread_sys_write __P((int, const char*, size_t));
-__dead void _thread_sys__exit __P((int)) __attribute__((__noreturn__));
+int	_thread_sys_write(int, const char*, size_t);
+__dead void _thread_sys__exit(int) __attribute__((__noreturn__));
 
 static __dead void __vpanic __P((const char *, const char *, const char *, 
 	int, const char *, va_list)) __attribute__((__noreturn__));
@@ -20,7 +20,7 @@ static __dead void __panic __P((const char *, const char *, const char *,
 #if defined(__OpenBSD__) || defined(__FreeBSD__)
 #include <pthread.h>
 #include <pthread_np.h>
-void	_thread_dump_info __P((void));
+void	_thread_dump_info(void);
 #define SET_NAME(x)	pthread_set_name_np(pthread_self(), x)
 #define DUMP_INFO()	_thread_dump_info()
 #else
diff --git a/regress/lib/libpthread/include/test.h b/regress/lib/libpthread/include/test.h
index c66291c2166..32798c2d1df 100644
--- a/regress/lib/libpthread/include/test.h
+++ b/regress/lib/libpthread/include/test.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: test.h,v 1.2 2001/09/20 15:33:17 todd Exp $	*/
+/*	$OpenBSD: test.h,v 1.3 2002/02/16 21:27:32 millert Exp $	*/
 
 #ifndef _h_test_
 #define _h_test_
@@ -9,8 +9,8 @@
 #include <string.h>
 #include <stdarg.h>
 
-int	_thread_sys_write __P((int, const char*, size_t));
-__dead void _thread_sys__exit __P((int)) __attribute__((__noreturn__));
+int	_thread_sys_write(int, const char*, size_t);
+__dead void _thread_sys__exit(int) __attribute__((__noreturn__));
 
 static __dead void __vpanic __P((const char *, const char *, const char *, 
 	int, const char *, va_list)) __attribute__((__noreturn__));
@@ -20,7 +20,7 @@ static __dead void __panic __P((const char *, const char *, const char *,
 #if defined(__OpenBSD__) || defined(__FreeBSD__)
 #include <pthread.h>
 #include <pthread_np.h>
-void	_thread_dump_info __P((void));
+void	_thread_dump_info(void);
 #define SET_NAME(x)	pthread_set_name_np(pthread_self(), x)
 #define DUMP_INFO()	_thread_dump_info()
 #else
diff --git a/regress/sys/arch/m68k/emuspeed/emuspeed.c b/regress/sys/arch/m68k/emuspeed/emuspeed.c
index a0d51725430..7fd19d98fa8 100644
--- a/regress/sys/arch/m68k/emuspeed/emuspeed.c
+++ b/regress/sys/arch/m68k/emuspeed/emuspeed.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: emuspeed.c,v 1.2 2001/01/29 02:05:53 niklas Exp $	*/
+/*	$OpenBSD: emuspeed.c,v 1.3 2002/02/16 21:27:32 millert Exp $	*/
 /*	$NetBSD: emuspeed.c,v 1.3 1998/06/15 14:43:25 is Exp $	*/
 
 #include <setjmp.h>
@@ -14,7 +14,7 @@
 
 const struct test {
 	char *name; 
-	void (*func)__P((int));
+	void (*func)(int);
 	char *comment;
 } testlist[] = {
 	{"Illegal", illegal, "(test: unimplemented)"},
diff --git a/regress/sys/arch/m68k/emuspeed/speed.h b/regress/sys/arch/m68k/emuspeed/speed.h
index e2dd75ef661..f2f7bbcccff 100644
--- a/regress/sys/arch/m68k/emuspeed/speed.h
+++ b/regress/sys/arch/m68k/emuspeed/speed.h
@@ -1,18 +1,18 @@
-/*	$OpenBSD: speed.h,v 1.2 2001/01/29 02:05:54 niklas Exp $	*/
+/*	$OpenBSD: speed.h,v 1.3 2002/02/16 21:27:32 millert Exp $	*/
 /*	$NetBSD: speed.h,v 1.2 1998/01/09 08:03:57 perry Exp $	*/
 
 #include <sys/cdefs.h>
 
-void illegal __P((int));
-void mul32smem __P((int));
-void mul32sreg __P((int));
+void illegal(int);
+void mul32smem(int);
+void mul32sreg(int);
 
-void mul64sreg __P((int));
-void mul64ureg __P((int));
-void mul64smem __P((int));
-void mul64umem __P((int));
+void mul64sreg(int);
+void mul64ureg(int);
+void mul64smem(int);
+void mul64umem(int);
 
-void div64umem __P((int));
-void div64smem __P((int));
-void div64ureg __P((int));
-void div64sreg __P((int));
+void div64umem(int);
+void div64smem(int);
+void div64ureg(int);
+void div64sreg(int);
diff --git a/regress/sys/kern/unfdpass/unfdpass.c b/regress/sys/kern/unfdpass/unfdpass.c
index 589023e8426..1a9727c8d2f 100644
--- a/regress/sys/kern/unfdpass/unfdpass.c
+++ b/regress/sys/kern/unfdpass/unfdpass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unfdpass.c,v 1.6 2002/02/11 05:31:25 art Exp $	*/
+/*	$OpenBSD: unfdpass.c,v 1.7 2002/02/16 21:27:32 millert Exp $	*/
 /*	$NetBSD: unfdpass.c,v 1.3 1998/06/24 23:51:30 thorpej Exp $	*/
 
 /*-
@@ -58,9 +58,9 @@
 
 #define	SOCK_NAME	"test-sock"
 
-int	main __P((int, char *[]));
-void	child __P((void));
-void	catch_sigchld __P((int));
+int	main(int, char *[]);
+void	child(void);
+void	catch_sigchld(int);
 
 /* ARGSUSED */
 int