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.

7 files changed, 53 insertions, 53 deletions

diff --git a/sbin/fdisk/cmd.h b/sbin/fdisk/cmd.h
index 0b15f9ed44a..48dd0e64b27 100644
--- a/sbin/fdisk/cmd.h
+++ b/sbin/fdisk/cmd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.h,v 1.6 2001/08/12 12:03:01 heko Exp $	*/
+/*	$OpenBSD: cmd.h,v 1.7 2002/02/16 21:27:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -62,20 +62,20 @@ typedef struct _cmd_table_t {
 
 
 /* Prototypes */
-int Xreinit __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int));
-int Xdisk __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int));
-int Xmanual __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int));
-int Xedit __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int));
-int Xsetpid __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int));
-int Xselect __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int));
-int Xprint __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int));
-int Xwrite __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int));
-int Xexit __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int));
-int Xquit __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int));
-int Xabort __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int));
-int Xhelp __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int));
-int Xflag __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int));
-int Xupdate __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int));
+int Xreinit(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
+int Xdisk(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
+int Xmanual(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
+int Xedit(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
+int Xsetpid(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
+int Xselect(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
+int Xprint(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
+int Xwrite(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
+int Xexit(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
+int Xquit(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
+int Xabort(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
+int Xhelp(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
+int Xflag(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
+int Xupdate(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
 
 #endif /* _CMD_H */
 
diff --git a/sbin/fdisk/disk.h b/sbin/fdisk/disk.h
index 2889997a9d8..161fd8075cb 100644
--- a/sbin/fdisk/disk.h
+++ b/sbin/fdisk/disk.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disk.h,v 1.5 2002/01/18 08:38:26 kjell Exp $	*/
+/*	$OpenBSD: disk.h,v 1.6 2002/02/16 21:27:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -49,10 +49,10 @@ typedef struct _disk_t {
 } disk_t;
 
 /* Prototypes */
-int DISK_open __P((char *, int));
-int DISK_close __P((int));
-int DISK_getmetrics __P((disk_t *, DISK_metrics *));
-int DISK_printmetrics __P((disk_t *, char *));
+int DISK_open(char *, int);
+int DISK_close(int);
+int DISK_getmetrics(disk_t *, DISK_metrics *);
+int DISK_printmetrics(disk_t *, char *);
 
 #endif /* _DISK_H */
 
diff --git a/sbin/fdisk/mbr.h b/sbin/fdisk/mbr.h
index 306b0be6a36..1ba4f243cd3 100644
--- a/sbin/fdisk/mbr.h
+++ b/sbin/fdisk/mbr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbr.h,v 1.9 2002/01/18 08:38:26 kjell Exp $	*/
+/*	$OpenBSD: mbr.h,v 1.10 2002/02/16 21:27:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -52,14 +52,14 @@ typedef struct _mbr_t {
 } mbr_t;
 
 /* Prototypes */
-void MBR_print_disk __P((char *));
-void MBR_print __P((mbr_t *, char *));
-void MBR_parse __P((disk_t *, char *, off_t, off_t, mbr_t *));
-void MBR_make __P((mbr_t *, char *));
-void MBR_init __P((disk_t *, mbr_t *));
-int MBR_read __P((int, off_t, char *));
-int MBR_write __P((int, off_t, char *));
-void MBR_pcopy __P((disk_t *, mbr_t *));
+void MBR_print_disk(char *);
+void MBR_print(mbr_t *, char *);
+void MBR_parse(disk_t *, char *, off_t, off_t, mbr_t *);
+void MBR_make(mbr_t *, char *);
+void MBR_init(disk_t *, mbr_t *);
+int MBR_read(int, off_t, char *);
+int MBR_write(int, off_t, char *);
+void MBR_pcopy(disk_t *, mbr_t *);
 
 /* Sanity check */
 #include <machine/param.h>
diff --git a/sbin/fdisk/misc.c b/sbin/fdisk/misc.c
index e511cf36a8c..09064917970 100644
--- a/sbin/fdisk/misc.c
+++ b/sbin/fdisk/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.9 2002/01/23 22:04:01 mickey Exp $	*/
+/*	$OpenBSD: misc.c,v 1.10 2002/02/16 21:27:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -90,7 +90,7 @@ ask_num(str, flags, dflt, low, high, help)
 	int dflt;
 	int low;
 	int high;
-	void (*help) __P((void));
+	void (*help)(void);
 {
 	char lbuf[100], *cp;
 	int num;
diff --git a/sbin/fdisk/misc.h b/sbin/fdisk/misc.h
index 3a17487321e..248afc00cd6 100644
--- a/sbin/fdisk/misc.h
+++ b/sbin/fdisk/misc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.h,v 1.6 2002/01/18 08:38:26 kjell Exp $	*/
+/*	$OpenBSD: misc.h,v 1.7 2002/02/16 21:27:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -60,15 +60,15 @@ static const struct unit_type {
 #define	DO_ROUNDING	0x00000002
 
 /* Prototypes */
-int unit_lookup __P((char *));
-int ask_cmd __P((cmd_t *));
-int ask_num __P((const char *, int, int, int, int, void (*help) __P((void))));
-int ask_yn __P((const char *));
-u_int16_t getshort __P((void *));
-u_int32_t getlong __P((void *));
-void putshort __P((void *, u_int16_t));
-void putlong __P((void *, u_int32_t));
-u_int32_t getuint __P((disk_t *, char *, char *, u_int32_t, u_int32_t, u_int32_t, int));
+int unit_lookup(char *);
+int ask_cmd(cmd_t *);
+int ask_num __P((const char *, int, int, int, int, void (*help)(void)));
+int ask_yn(const char *);
+u_int16_t getshort(void *);
+u_int32_t getlong(void *);
+void putshort(void *, u_int16_t);
+void putlong(void *, u_int32_t);
+u_int32_t getuint(disk_t *, char *, char *, u_int32_t, u_int32_t, u_int32_t, int);
 
 #endif /* _MISC_H */
 
diff --git a/sbin/fdisk/part.h b/sbin/fdisk/part.h
index 965a6d6d2ce..d9a56b2c69d 100644
--- a/sbin/fdisk/part.h
+++ b/sbin/fdisk/part.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: part.h,v 1.9 2002/01/18 08:38:26 kjell Exp $	*/
+/*	$OpenBSD: part.h,v 1.10 2002/02/16 21:27:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -44,17 +44,17 @@ typedef struct _prt_t {
 } prt_t;
 
 /* Prototypes */
-void	PRT_printall __P((void));
-const char *PRT_ascii_id __P((int));
-void PRT_parse __P((disk_t *, void *, off_t, off_t, prt_t *, int));
-void PRT_make __P((prt_t *, off_t, off_t, void *));
-void PRT_print __P((int, prt_t *, char *));
+void	PRT_printall(void);
+const char *PRT_ascii_id(int);
+void PRT_parse(disk_t *, void *, off_t, off_t, prt_t *, int);
+void PRT_make(prt_t *, off_t, off_t, void *);
+void PRT_print(int, prt_t *, char *);
 
 /* This does CHS -> bs/ns */
-void PRT_fix_BN __P((disk_t *, prt_t *, int));
+void PRT_fix_BN(disk_t *, prt_t *, int);
 
 /* This does bs/ns -> CHS */
-void PRT_fix_CHS __P((disk_t *, prt_t *, int));
+void PRT_fix_CHS(disk_t *, prt_t *, int);
 
 #endif /* _PART_H */
 
diff --git a/sbin/fdisk/user.h b/sbin/fdisk/user.h
index 65f8667dde0..96c624ded05 100644
--- a/sbin/fdisk/user.h
+++ b/sbin/fdisk/user.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: user.h,v 1.5 2001/12/15 02:12:26 kjell Exp $	*/
+/*	$OpenBSD: user.h,v 1.6 2002/02/16 21:27:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -37,9 +37,9 @@
 #include "mbr.h"
 
 /* Prototypes */
-int USER_init __P((disk_t *, mbr_t *, int));
-int USER_modify __P((disk_t *, mbr_t *, off_t, off_t));
-int USER_print_disk __P((disk_t *));
+int USER_init(disk_t *, mbr_t *, int);
+int USER_modify(disk_t *, mbr_t *, off_t, off_t);
+int USER_print_disk(disk_t *);
 
 #endif /* _USER_H */