First round of __P removal in sys

4 files changed, 36 insertions, 37 deletions

diff --git a/sys/stand/boot/bootarg.h b/sys/stand/boot/bootarg.h
index 8202c57a591..414cf7a8e27 100644
--- a/sys/stand/boot/bootarg.h
+++ b/sys/stand/boot/bootarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootarg.h,v 1.8 1999/08/25 00:54:18 mickey Exp $	*/
+/*	$OpenBSD: bootarg.h,v 1.9 2002/03/14 01:27:13 millert Exp $	*/
 
 /*
  * Copyright (c) 1996-1999 Michael Shalayeff
@@ -55,6 +55,6 @@ extern bootarg_t *bootargp;
 #endif
 
 #ifdef _STANDALONE
-void addbootarg __P((int, size_t, void *));
-void makebootargs __P((caddr_t, size_t *));
+void addbootarg(int, size_t, void *);
+void makebootargs(caddr_t, size_t *);
 #endif /* _STANDALONE */
diff --git a/sys/stand/boot/cmd.c b/sys/stand/boot/cmd.c
index a575fee3645..d5b74650be4 100644
--- a/sys/stand/boot/cmd.c
+++ b/sys/stand/boot/cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.c,v 1.46 2000/01/20 19:56:48 mickey Exp $	*/
+/*	$OpenBSD: cmd.c,v 1.47 2002/03/14 01:27:13 millert Exp $	*/
 
 /*
  * Copyright (c) 1997-1999 Michael Shalayeff
@@ -39,20 +39,20 @@
 
 #define CTRL(c)	((c)&0x1f)
 
-static int Xboot __P((void));
-static int Xecho __P((void));
-static int Xhelp __P((void));
-static int Xls __P((void));
-static int Xnop __P((void));
-static int Xreboot __P((void));
-static int Xstty __P((void));
-static int Xtime __P((void));
+static int Xboot(void);
+static int Xecho(void);
+static int Xhelp(void);
+static int Xls(void);
+static int Xnop(void);
+static int Xreboot(void);
+static int Xstty(void);
+static int Xtime(void);
 #ifdef MACHINE_CMD
-static int Xmachine __P((void));
+static int Xmachine(void);
 extern const struct cmd_table MACHINE_CMD[];
 #endif
-extern int Xset __P((void));
-extern int Xenv __P((void));
+extern int Xset(void);
+extern int Xenv(void);
 
 extern const struct cmd_table cmd_set[];
 const struct cmd_table cmd_table[] = {
@@ -72,13 +72,12 @@ const struct cmd_table cmd_table[] = {
 	{NULL, 0},
 };
 
-static void ls __P((char *, register struct stat *));
-static int readline __P((register char *, size_t, int));
-char *nextword __P((register char *));
-static char *whatcmd
-	__P((register const struct cmd_table **ct, register char *));
-static int docmd __P((void));
-static char *qualify __P((char *));
+static void ls(char *, register struct stat *);
+static int readline(register char *, size_t, int);
+char *nextword(register char *);
+static char *whatcmd(register const struct cmd_table **ct, register char *);
+static int docmd(void);
+static char *qualify(char *);
 
 char cmd_buf[133];
 
diff --git a/sys/stand/boot/cmd.h b/sys/stand/boot/cmd.h
index fdac86cc1fe..cd8c1936b19 100644
--- a/sys/stand/boot/cmd.h
+++ b/sys/stand/boot/cmd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.h,v 1.10 1998/05/25 19:17:42 mickey Exp $	*/
+/*	$OpenBSD: cmd.h,v 1.11 2002/03/14 01:27:13 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -40,7 +40,7 @@ struct cmd_table {
 #define CMDT_VAR 1
 #define CMDT_SET 2
 #define CMDT_MDC 3
-	int (*cmd_exec) __P((void));
+	int (*cmd_exec)(void);
 };
 
 struct cmd_state {
@@ -58,6 +58,6 @@ struct cmd_state {
 };
 extern struct cmd_state cmd;
 
-int getcmd __P((void));
-int read_conf __P((void));
-int bootparse __P((int));
+int getcmd(void);
+int read_conf(void);
+int bootparse(int);
diff --git a/sys/stand/boot/vars.c b/sys/stand/boot/vars.c
index 7fa5c464cff..9876b877a4d 100644
--- a/sys/stand/boot/vars.c
+++ b/sys/stand/boot/vars.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vars.c,v 1.6 2001/05/02 16:32:10 mickey Exp $	*/
+/*	$OpenBSD: vars.c,v 1.7 2002/03/14 01:27:13 millert Exp $	*/
 
 /*
  * Copyright (c) 1998-2000 Michael Shalayeff
@@ -40,17 +40,17 @@
 extern const char version[];
 extern int debug;
 
-static int Xaddr __P((void));
-static int Xdevice __P((void));
+static int Xaddr(void);
+static int Xdevice(void);
 #ifdef DEBUG
-static int Xdebug __P((void));
+static int Xdebug(void);
 #endif
-static int Ximage __P((void));
-static int Xhowto __P((void));
-static int Xtty __P((void));
-static int Xtimeout __P((void));
-int Xset __P((void));
-int Xenv __P((void));
+static int Ximage(void);
+static int Xhowto(void);
+static int Xtty(void);
+static int Xtimeout(void);
+int Xset(void);
+int Xenv(void);
 
 const struct cmd_table cmd_set[] = {
 	{"addr",   CMDT_VAR, Xaddr},