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.

4 files changed, 29 insertions, 29 deletions

diff --git a/usr.sbin/eeprom/defs.h b/usr.sbin/eeprom/defs.h
index 35870dee007..f51f9217aad 100644
--- a/usr.sbin/eeprom/defs.h
+++ b/usr.sbin/eeprom/defs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: defs.h,v 1.2 1996/03/25 15:55:18 niklas Exp $	*/
+/*	$OpenBSD: defs.h,v 1.3 2002/02/16 21:28:02 millert Exp $	*/
 /*	$NetBSD: defs.h,v 1.2 1996/02/28 01:13:20 thorpej Exp $	*/
 
 /*-
@@ -62,7 +62,7 @@
 struct	keytabent {
 	char	*kt_keyword;		/* keyword for this entry */
 	u_int	kt_offset;		/* offset into prom of value */
-	void	(*kt_handler) __P((struct keytabent *, char *));
+	void	(*kt_handler)(struct keytabent *, char *);
 					/* handler function for this entry */
 };
 
@@ -90,25 +90,25 @@ struct	extabent {
 #endif /* __sparc__ */
 
 /* Sun 3/4 EEPROM handlers. */
-void	ee_hwupdate __P((struct keytabent *, char *));
-void	ee_num8 __P((struct keytabent *, char *));
-void	ee_num16 __P((struct keytabent *, char *));
-void	ee_screensize __P((struct keytabent *, char *));
-void	ee_truefalse __P((struct keytabent *, char *));
-void	ee_bootdev __P((struct keytabent *, char *));
-void	ee_kbdtype __P((struct keytabent *, char *));
-void	ee_constype __P((struct keytabent *, char *));
-void	ee_diagpath __P((struct keytabent *, char *));
-void	ee_banner __P((struct keytabent *, char *));
-void	ee_notsupp __P((struct keytabent *, char *));
+void	ee_hwupdate(struct keytabent *, char *);
+void	ee_num8(struct keytabent *, char *);
+void	ee_num16(struct keytabent *, char *);
+void	ee_screensize(struct keytabent *, char *);
+void	ee_truefalse(struct keytabent *, char *);
+void	ee_bootdev(struct keytabent *, char *);
+void	ee_kbdtype(struct keytabent *, char *);
+void	ee_constype(struct keytabent *, char *);
+void	ee_diagpath(struct keytabent *, char *);
+void	ee_banner(struct keytabent *, char *);
+void	ee_notsupp(struct keytabent *, char *);
 
 /* Sun 3/4 EEPROM checksum routines. */
-u_char	ee_checksum __P((u_char *, size_t));
-void	ee_updatechecksums __P((void));
-void	ee_verifychecksums __P((void));
+u_char	ee_checksum(u_char *, size_t);
+void	ee_updatechecksums(void);
+void	ee_verifychecksums(void);
 
 #ifdef __sparc__
 /* Sparc Openprom handlers. */
-char	*op_handler __P((char *, char *));
-void	op_dump __P((void));
+char	*op_handler(char *, char *);
+void	op_dump(void);
 #endif /* __sparc__ */
diff --git a/usr.sbin/eeprom/eehandlers.c b/usr.sbin/eeprom/eehandlers.c
index a404eba3d40..f8547e275ae 100644
--- a/usr.sbin/eeprom/eehandlers.c
+++ b/usr.sbin/eeprom/eehandlers.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eehandlers.c,v 1.7 2001/09/20 20:42:25 jason Exp $	*/
+/*	$OpenBSD: eehandlers.c,v 1.8 2002/02/16 21:28:02 millert Exp $	*/
 /*	$NetBSD: eehandlers.c,v 1.2 1996/02/28 01:13:22 thorpej Exp $	*/
 
 /*-
@@ -65,12 +65,12 @@ extern	int cksumfail;
 extern	u_short writecount;
 
 struct	timeb;
-extern	time_t get_date __P((char *, struct timeb *));
+extern	time_t get_date(char *, struct timeb *);
 
 static	char err_str[BUFSIZE];
 
-static	void badval __P((struct keytabent *, char *));
-static	int doio __P((struct keytabent *, u_char *, ssize_t, int));
+static	void badval(struct keytabent *, char *);
+static	int doio(struct keytabent *, u_char *, ssize_t, int);
 
 #define BARF(kt) {							\
 	badval((kt), arg);						\
diff --git a/usr.sbin/eeprom/main.c b/usr.sbin/eeprom/main.c
index 4e0a1d01b1b..5d836aa3d8b 100644
--- a/usr.sbin/eeprom/main.c
+++ b/usr.sbin/eeprom/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.7 2001/09/20 20:42:25 jason Exp $	*/
+/*	$OpenBSD: main.c,v 1.8 2002/02/16 21:28:02 millert Exp $	*/
 /*	$NetBSD: main.c,v 1.3 1996/05/16 16:00:55 thorpej Exp $	*/
 
 /*-
@@ -100,11 +100,11 @@ struct	keytabent eekeytab[] = {
 	{ NULL,			0,	ee_notsupp },
 };
 
-static	void action __P((char *));
-static	void dump_prom __P((void));
-static	void usage __P((void));
+static	void action(char *);
+static	void dump_prom(void);
+static	void usage(void);
 #ifdef __sparc__
-static	int getcputype __P((void));
+static	int getcputype(void);
 #endif /* __sparc__ */
 
 char	*path_eeprom = "/dev/eeprom";
diff --git a/usr.sbin/eeprom/ophandlers.c b/usr.sbin/eeprom/ophandlers.c
index 315d59c1c6e..4eaa259e757 100644
--- a/usr.sbin/eeprom/ophandlers.c
+++ b/usr.sbin/eeprom/ophandlers.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ophandlers.c,v 1.4 1996/08/31 13:12:12 deraadt Exp $	*/
+/*	$OpenBSD: ophandlers.c,v 1.5 2002/02/16 21:28:02 millert Exp $	*/
 /*	$NetBSD: ophandlers.c,v 1.2 1996/02/28 01:13:30 thorpej Exp $	*/
 
 /*-
@@ -57,7 +57,7 @@ extern	int verbose;
 
 static	char err_str[BUFSIZE];
 
-static	void op_notsupp __P((struct extabent *, struct opiocdesc *, char *));
+static	void op_notsupp(struct extabent *, struct opiocdesc *, char *);
 
 /*
  * There are several known fields that I either don't know how to