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.

123 files changed, 1255 insertions, 1255 deletions

diff --git a/sbin/ancontrol/ancontrol.c b/sbin/ancontrol/ancontrol.c
index a4403c4313c..c78f1462bd3 100644
--- a/sbin/ancontrol/ancontrol.c
+++ b/sbin/ancontrol/ancontrol.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ancontrol.c,v 1.18 2001/09/29 21:57:15 mickey Exp $	*/
+/*	$OpenBSD: ancontrol.c,v 1.19 2002/02/16 21:27:32 millert Exp $	*/
 /*
  * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
  *
@@ -62,30 +62,30 @@ static const char rcsid[] =
 
 #define	an_printbool(val) printf(val? "[ On ]" : "[ Off ]")
 
-void an_getval		__P((struct an_req *));
-void an_setval		__P((struct an_req *));
-void an_printwords	__P((u_int16_t *, int));
-void an_printspeeds	__P((u_int8_t*, int));
-void an_printhex	__P((char *, int));
-void an_printstr	__P((char *, int));
-void an_dumpstatus	__P((void));
-void an_dumpstats	__P((void));
-void an_dumpconfig	__P((void));
-void an_dumpcaps	__P((void));
-void an_dumpssid	__P((void));
-void an_dumpap		__P((void));
-void an_setconfig	__P((int, void *));
-void an_setssid		__P((int, void *));
-void an_setap		__P((int, void *));
-void an_setspeed	__P((void *));
-void an_readkeyinfo	__P((void));
+void an_getval(struct an_req *);
+void an_setval(struct an_req *);
+void an_printwords(u_int16_t *, int);
+void an_printspeeds(u_int8_t*, int);
+void an_printhex(char *, int);
+void an_printstr(char *, int);
+void an_dumpstatus(void);
+void an_dumpstats(void);
+void an_dumpconfig(void);
+void an_dumpcaps(void);
+void an_dumpssid(void);
+void an_dumpap(void);
+void an_setconfig(int, void *);
+void an_setssid(int, void *);
+void an_setap(int, void *);
+void an_setspeed(void *);
+void an_readkeyinfo(void);
 #ifdef ANCACHE
-void an_zerocache	__P((void));
-void an_readcache	__P((void));
+void an_zerocache(void);
+void an_readcache(void);
 #endif
-void getsock		__P((void));
-static void usage	__P((void));
-int main		__P((int, char **));
+void getsock(void);
+static void usage(void);
+int main(int, char **);
 
 /* flags to trigger dumping information about configs */
 #define STAT_DUMPAP	0x01
diff --git a/sbin/atactl/atactl.c b/sbin/atactl/atactl.c
index bfa9a278bbf..c491927ac31 100644
--- a/sbin/atactl/atactl.c
+++ b/sbin/atactl/atactl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atactl.c,v 1.9 2002/01/30 00:46:36 csapuntz Exp $	*/
+/*	$OpenBSD: atactl.c,v 1.10 2002/02/16 21:27:33 millert Exp $	*/
 /*	$NetBSD: atactl.c,v 1.4 1999/02/24 18:49:14 jwise Exp $	*/
 
 /*-
@@ -58,7 +58,7 @@
 
 struct command {
 	const char *cmd_name;
-	void (*cmd_func) __P((int, char *[]));
+	void (*cmd_func)(int, char *[]);
 };
 
 struct bitinfo {
@@ -66,10 +66,10 @@ struct bitinfo {
 	const char *string;
 };
 
-int	main __P((int, char *[]));
-void	usage __P((void));
-void	ata_command __P((struct atareq *));
-void	print_bitinfo __P((const char *, u_int, struct bitinfo *));
+int	main(int, char *[]);
+void	usage(void);
+void	ata_command(struct atareq *);
+void	print_bitinfo(const char *, u_int, struct bitinfo *);
 
 int	fd;				/* file descriptor for device */
 const	char *dvname;			/* device name */
@@ -79,14 +79,14 @@ const	char *cmdname;			/* command user issued */
 extern const char *__progname;		/* from crt0.o */
 
 void    device_dump(int, char*[]);
-void	device_identify __P((int, char *[]));
-void	device_setidle __P((int, char *[]));
-void	device_idle __P((int, char *[]));
-void	device_checkpower __P((int, char *[]));
-void	device_acoustic __P((int, char *[]));
-void	device_apm __P((int, char *[]));
-void	device_feature __P((int, char *[]));
-void	device_smart __P((int, char *[]));
+void	device_identify(int, char *[]);
+void	device_setidle(int, char *[]);
+void	device_idle(int, char *[]);
+void	device_checkpower(int, char *[]);
+void	device_acoustic(int, char *[]);
+void	device_apm(int, char *[]);
+void	device_feature(int, char *[]);
+void	device_smart(int, char *[]);
 
 struct command commands[] = {
 	{ "dump",               device_dump },
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
index 8449b77d9dd..337c361ff9d 100644
--- a/sbin/badsect/badsect.c
+++ b/sbin/badsect/badsect.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: badsect.c,v 1.6 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: badsect.c,v 1.7 2002/02/16 21:27:33 millert Exp $	*/
 /*	$NetBSD: badsect.c,v 1.10 1995/03/18 14:54:28 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)badsect.c	8.1 (Berkeley) 6/5/93";
 #else
-static char rcsid[] = "$OpenBSD: badsect.c,v 1.6 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: badsect.c,v 1.7 2002/02/16 21:27:33 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -89,8 +89,8 @@ long	dev_bsize = 1;
 
 char buf[MAXBSIZE];
 
-void	rdfs __P((daddr_t, int, char *));
-int	chkuse __P((daddr_t, int));
+void	rdfs(daddr_t, int, char *);
+int	chkuse(daddr_t, int);
 
 int
 main(argc, argv)
diff --git a/sbin/brconfig/brconfig.c b/sbin/brconfig/brconfig.c
index 7fb0e1e26c7..97868096f02 100644
--- a/sbin/brconfig/brconfig.c
+++ b/sbin/brconfig/brconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: brconfig.c,v 1.16 2001/12/15 09:03:23 jason Exp $	*/
+/*	$OpenBSD: brconfig.c,v 1.17 2002/02/16 21:27:33 millert Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -50,40 +50,40 @@
 #include <stdlib.h>
 #include <limits.h>
 
-void usage __P((void));
-int main __P((int, char **));
-int bridge_setflag __P((int, char *, short));
-int bridge_clrflag __P((int, char *, short));
-int bridge_ifsetflag __P((int, char *, char *, u_int32_t));
-int bridge_ifclrflag __P((int, char *, char *, u_int32_t));
-int bridge_list __P((int, char *, char *));
-int bridge_cfg __P((int, char *, char *));
-int bridge_addrs __P((int, char *, char *));
-int bridge_addaddr __P((int, char *, char *, char *));
-int bridge_deladdr __P((int, char *, char *));
-int bridge_maxaddr __P((int, char *, char *));
-int bridge_maxage __P((int, char *, char *));
-int bridge_priority __P((int, char *, char *));
-int bridge_fwddelay __P((int, char *, char *));
-int bridge_hellotime __P((int, char *, char *));
-int bridge_ifprio __P((int, char *, char *, char *));
-int bridge_timeout __P((int, char *, char *));
-int bridge_flush __P((int, char *));
-int bridge_flushall __P((int, char *));
-int bridge_add __P((int, char *, char *));
-int bridge_delete __P((int, char *, char *));
-int bridge_addspan __P((int, char *, char *));
-int bridge_delspan __P((int, char *, char *));
-int bridge_status __P((int, char *));
-int is_bridge __P((int, char *));
-int bridge_show_all __P((int));
-void printb __P((char *, unsigned short, char *));
-int bridge_rule __P((int, char *, int, char **, int));
-int bridge_rules __P((int, char *, char *, char *));
-int bridge_flushrule __P((int, char *, char *));
-void bridge_badrule __P((int, char **, int));
-void bridge_showrule __P((struct ifbrlreq *, char *));
-int bridge_rulefile __P((int, char *, char *));
+void usage(void);
+int main(int, char **);
+int bridge_setflag(int, char *, short);
+int bridge_clrflag(int, char *, short);
+int bridge_ifsetflag(int, char *, char *, u_int32_t);
+int bridge_ifclrflag(int, char *, char *, u_int32_t);
+int bridge_list(int, char *, char *);
+int bridge_cfg(int, char *, char *);
+int bridge_addrs(int, char *, char *);
+int bridge_addaddr(int, char *, char *, char *);
+int bridge_deladdr(int, char *, char *);
+int bridge_maxaddr(int, char *, char *);
+int bridge_maxage(int, char *, char *);
+int bridge_priority(int, char *, char *);
+int bridge_fwddelay(int, char *, char *);
+int bridge_hellotime(int, char *, char *);
+int bridge_ifprio(int, char *, char *, char *);
+int bridge_timeout(int, char *, char *);
+int bridge_flush(int, char *);
+int bridge_flushall(int, char *);
+int bridge_add(int, char *, char *);
+int bridge_delete(int, char *, char *);
+int bridge_addspan(int, char *, char *);
+int bridge_delspan(int, char *, char *);
+int bridge_status(int, char *);
+int is_bridge(int, char *);
+int bridge_show_all(int);
+void printb(char *, unsigned short, char *);
+int bridge_rule(int, char *, int, char **, int);
+int bridge_rules(int, char *, char *, char *);
+int bridge_flushrule(int, char *, char *);
+void bridge_badrule(int, char **, int);
+void bridge_showrule(struct ifbrlreq *, char *);
+int bridge_rulefile(int, char *, char *);
 
 /* if_flags bits: borrowed from ifconfig.c */
 #define	IFFBITS \
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index b6cb1d79a71..45bfb805c9b 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccdconfig.c,v 1.16 2001/07/07 18:26:10 deraadt Exp $	*/
+/*	$OpenBSD: ccdconfig.c,v 1.17 2002/02/16 21:27:33 millert Exp $	*/
 /*	$NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $	*/
 
 /*-
@@ -95,15 +95,15 @@ static	struct nlist nl[] = {
 #define CCD_UNCONFIGALL		3	/* unconfigure all devices */
 #define CCD_DUMP		4	/* dump a ccd's configuration */
 
-static	int checkdev __P((char *));
-static	int do_io __P((char *, u_long, struct ccd_ioctl *));
-static	int do_single __P((int, char **, int));
-static	int do_all __P((int));
-static	int dump_ccd __P((int, char **));
-static	int flags_to_val __P((char *));
-static	void print_ccd_info __P((struct ccd_softc *, kvm_t *));
-static	char *resolve_ccdname __P((char *));
-static	void usage __P((void));
+static	int checkdev(char *);
+static	int do_io(char *, u_long, struct ccd_ioctl *);
+static	int do_single(int, char **, int);
+static	int do_all(int);
+static	int dump_ccd(int, char **);
+static	int flags_to_val(char *);
+static	void print_ccd_info(struct ccd_softc *, kvm_t *);
+static	char *resolve_ccdname(char *);
+static	void usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 875a1b99eab..bfaa8811cda 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.c,v 1.71 2001/09/03 16:14:27 millert Exp $	*/
+/*	$OpenBSD: disklabel.c,v 1.72 2002/02/16 21:27:33 millert Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -43,7 +43,7 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.71 2001/09/03 16:14:27 millert Exp $";
+static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.72 2002/02/16 21:27:33 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -116,29 +116,29 @@ int	donothing;
 
 #ifdef DOSLABEL
 struct dos_partition *dosdp;	/* DOS partition, if found */
-struct dos_partition *readmbr __P((int));
+struct dos_partition *readmbr(int);
 #endif
 
-void	makedisktab __P((FILE *, struct disklabel *));
-void	makelabel __P((char *, char *, struct disklabel *));
-int	writelabel __P((int, char *, struct disklabel *));
-void	l_perror __P((char *));
-struct disklabel *readlabel __P((int));
-struct disklabel *makebootarea __P((char *, struct disklabel *, int));
-void	display __P((FILE *, struct disklabel *));
-void	display_partition __P((FILE *, struct disklabel *, char **, int, char, int));
-int	width_partition __P((struct disklabel *, int));
-int	editor __P((struct disklabel *, int, char *, char *));
-int	edit __P((struct disklabel *, int));
-int	editit __P((void));
-char	*skip __P((char *));
-char	*word __P((char *));
-int	getasciilabel __P((FILE *, struct disklabel *));
-int	checklabel __P((struct disklabel *));
-int	cmplabel __P((struct disklabel *, struct disklabel *));
-void	setbootflag __P((struct disklabel *));
-void	usage __P((void));
-u_short	dkcksum __P((struct disklabel *));
+void	makedisktab(FILE *, struct disklabel *);
+void	makelabel(char *, char *, struct disklabel *);
+int	writelabel(int, char *, struct disklabel *);
+void	l_perror(char *);
+struct disklabel *readlabel(int);
+struct disklabel *makebootarea(char *, struct disklabel *, int);
+void	display(FILE *, struct disklabel *);
+void	display_partition(FILE *, struct disklabel *, char **, int, char, int);
+int	width_partition(struct disklabel *, int);
+int	editor(struct disklabel *, int, char *, char *);
+int	edit(struct disklabel *, int);
+int	editit(void);
+char	*skip(char *);
+char	*word(char *);
+int	getasciilabel(FILE *, struct disklabel *);
+int	checklabel(struct disklabel *);
+int	cmplabel(struct disklabel *, struct disklabel *);
+void	setbootflag(struct disklabel *);
+void	usage(void);
+u_short	dkcksum(struct disklabel *);
 
 int
 main(argc, argv)
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c
index 23c8547cf17..7d4f1ed8177 100644
--- a/sbin/disklabel/editor.c
+++ b/sbin/disklabel/editor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: editor.c,v 1.78 2002/01/24 23:01:19 millert Exp $	*/
+/*	$OpenBSD: editor.c,v 1.79 2002/02/16 21:27:33 millert Exp $	*/
 
 /*
  * Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -28,7 +28,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: editor.c,v 1.78 2002/01/24 23:01:19 millert Exp $";
+static char rcsid[] = "$OpenBSD: editor.c,v 1.79 2002/02/16 21:27:33 millert Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -77,55 +77,55 @@ struct mountinfo {
 	int partno;
 };
 
-void	edit_parms __P((struct disklabel *, u_int32_t *));
-int	editor __P((struct disklabel *, int, char *, char *));
-void	editor_add __P((struct disklabel *, char **, u_int32_t *, char *));
-void	editor_change __P((struct disklabel *, u_int32_t *, char *));
-void	editor_countfree __P((struct disklabel *, u_int32_t *));
-void	editor_delete __P((struct disklabel *, char **, u_int32_t *, char *));
-void	editor_display __P((struct disklabel *, char **, u_int32_t *, char));
-void	editor_help __P((char *));
-void	editor_modify __P((struct disklabel *, char **, u_int32_t *, char *));
-void	editor_name __P((struct disklabel *, char **, char *));
-char	*getstring __P((char *, char *, char *));
-u_int32_t getuint __P((struct disklabel *, int, char *, char *, u_int32_t, u_int32_t, u_int32_t, int));
-int	has_overlap __P((struct disklabel *, u_int32_t *, int));
-void	make_contiguous __P((struct disklabel *));
-u_int32_t next_offset __P((struct disklabel *, u_int32_t *));
-int	partition_cmp __P((const void *, const void *));
-struct partition **sort_partitions __P((struct disklabel *, u_int16_t *));
-void	getdisktype __P((struct disklabel *, char *, char *));
-void	find_bounds __P((struct disklabel *, struct disklabel *));
-void	set_bounds __P((struct disklabel *, u_int32_t *));
-struct diskchunk *free_chunks __P((struct disklabel *));
-char **	mpcopy __P((char **, char **));
-int	micmp __P((const void *, const void *));
-int	mpequal __P((char **, char **));
-int	mpsave __P((struct disklabel *, char **, char *, char *));
-int	get_bsize __P((struct disklabel *, int));
-int	get_cpg __P((struct disklabel *, int));
-int	get_fsize __P((struct disklabel *, int));
-int	get_fstype __P((struct disklabel *, int));
-int	get_mp __P((struct disklabel *, char **, int));
-int	get_offset __P((struct disklabel *, int));
-int	get_size __P((struct disklabel *, int, u_int32_t *, int));
-void	get_geometry __P((int, struct disklabel **, struct disklabel **));
-void	set_geometry __P((struct disklabel *, struct disklabel *, struct disklabel *, struct disklabel *, char *));
-void	zero_partitions __P((struct disklabel *, u_int32_t *));
+void	edit_parms(struct disklabel *, u_int32_t *);
+int	editor(struct disklabel *, int, char *, char *);
+void	editor_add(struct disklabel *, char **, u_int32_t *, char *);
+void	editor_change(struct disklabel *, u_int32_t *, char *);
+void	editor_countfree(struct disklabel *, u_int32_t *);
+void	editor_delete(struct disklabel *, char **, u_int32_t *, char *);
+void	editor_display(struct disklabel *, char **, u_int32_t *, char);
+void	editor_help(char *);
+void	editor_modify(struct disklabel *, char **, u_int32_t *, char *);
+void	editor_name(struct disklabel *, char **, char *);
+char	*getstring(char *, char *, char *);
+u_int32_t getuint(struct disklabel *, int, char *, char *, u_int32_t, u_int32_t, u_int32_t, int);
+int	has_overlap(struct disklabel *, u_int32_t *, int);
+void	make_contiguous(struct disklabel *);
+u_int32_t next_offset(struct disklabel *, u_int32_t *);
+int	partition_cmp(const void *, const void *);
+struct partition **sort_partitions(struct disklabel *, u_int16_t *);
+void	getdisktype(struct disklabel *, char *, char *);
+void	find_bounds(struct disklabel *, struct disklabel *);
+void	set_bounds(struct disklabel *, u_int32_t *);
+struct diskchunk *free_chunks(struct disklabel *);
+char **	mpcopy(char **, char **);
+int	micmp(const void *, const void *);
+int	mpequal(char **, char **);
+int	mpsave(struct disklabel *, char **, char *, char *);
+int	get_bsize(struct disklabel *, int);
+int	get_cpg(struct disklabel *, int);
+int	get_fsize(struct disklabel *, int);
+int	get_fstype(struct disklabel *, int);
+int	get_mp(struct disklabel *, char **, int);
+int	get_offset(struct disklabel *, int);
+int	get_size(struct disklabel *, int, u_int32_t *, int);
+void	get_geometry(int, struct disklabel **, struct disklabel **);
+void	set_geometry(struct disklabel *, struct disklabel *, struct disklabel *, struct disklabel *, char *);
+void	zero_partitions(struct disklabel *, u_int32_t *);
 
 static u_int32_t starting_sector;
 static u_int32_t ending_sector;
 static int expert;
 
 /* from disklabel.c */
-int	checklabel __P((struct disklabel *));
-void	display __P((FILE *, struct disklabel *));
-void	display_partition __P((FILE *, struct disklabel *, char **, int, char, int));
-int	width_partition __P((struct disklabel *, int));
-
-struct disklabel *readlabel __P((int));
-struct disklabel *makebootarea __P((char *, struct disklabel *, int));
-int	writelabel __P((int, char *, struct disklabel *));
+int	checklabel(struct disklabel *);
+void	display(FILE *, struct disklabel *);
+void	display_partition(FILE *, struct disklabel *, char **, int, char, int);
+int	width_partition(struct disklabel *, int);
+
+struct disklabel *readlabel(int);
+struct disklabel *makebootarea(char *, struct disklabel *, int);
+int	writelabel(int, char *, struct disklabel *);
 extern	char *bootarea, *specname;
 extern	int donothing;
 #ifdef DOSLABEL
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index 84e2523be14..9e61428bc50 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dmesg.c,v 1.14 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: dmesg.c,v 1.15 2002/02/16 21:27:33 millert Exp $	*/
 /*	$NetBSD: dmesg.c,v 1.8 1995/03/18 14:54:49 cgd Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)dmesg.c	8.1 (Berkeley) 6/5/93";
 #else
-static char rcsid[] = "$OpenBSD: dmesg.c,v 1.14 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: dmesg.c,v 1.15 2002/02/16 21:27:33 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -70,7 +70,7 @@ struct nlist nl[] = {
 	{ NULL },
 };
 
-void usage __P((void));
+void usage(void);
 
 #define	KREAD(addr, var) \
 	kvm_read(kd, addr, &var, sizeof(var)) != sizeof(var)
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index e7d80f3dd68..6cd1552c6dc 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dump.h,v 1.8 1998/11/24 01:25:46 deraadt Exp $	*/
+/*	$OpenBSD: dump.h,v 1.9 2002/02/16 21:27:33 millert Exp $	*/
 /*	$NetBSD: dump.h,v 1.11 1997/06/05 11:13:20 lukem Exp $	*/
 
 /*-
@@ -95,55 +95,55 @@ int	tp_bshift;	/* log2(TP_BSIZE) */
 #endif
 
 /* operator interface functions */
-void	broadcast __P((char *message));
-time_t	do_stats __P((void));
-void	lastdump __P((int arg));	/* int should be char */
-void	msg __P((const char *fmt, ...));
-void	msgtail __P((const char *fmt, ...));
-int	query __P((char *question));
-void	quit __P((const char *fmt, ...));
-void	statussig __P((int));
-void	timeest __P((void));
+void	broadcast(char *message);
+time_t	do_stats(void);
+void	lastdump(int arg);	/* int should be char */
+void	msg(const char *fmt, ...);
+void	msgtail(const char *fmt, ...);
+int	query(char *question);
+void	quit(const char *fmt, ...);
+void	statussig(int);
+void	timeest(void);
 
 /* mapping routines */
 struct	dinode;
-long	blockest __P((struct dinode *dp));
-void	mapfileino __P((ino_t, u_int64_t *, int *));
+long	blockest(struct dinode *dp);
+void	mapfileino(ino_t, u_int64_t *, int *);
 int	mapfiles __P((ino_t maxino, u_int64_t *tapesize, char *disk,
 		    char * const *dirv));
-int	mapdirs __P((ino_t maxino, u_int64_t *tapesize));
+int	mapdirs(ino_t maxino, u_int64_t *tapesize);
 
 /* file dumping routines */
-void	blksout __P((daddr_t *blkp, int frags, ino_t ino));
-void	bread __P((daddr_t blkno, char *buf, int size));	
-void	dumpino __P((struct dinode *dp, ino_t ino));
-void	dumpmap __P((char *map, int type, ino_t ino));
-void	writeheader __P((ino_t ino));
+void	blksout(daddr_t *blkp, int frags, ino_t ino);
+void	bread(daddr_t blkno, char *buf, int size);	
+void	dumpino(struct dinode *dp, ino_t ino);
+void	dumpmap(char *map, int type, ino_t ino);
+void	writeheader(ino_t ino);
 
 /* tape writing routines */
-int	alloctape __P((void));
-void	close_rewind __P((void));
-void	dumpblock __P((daddr_t blkno, int size));
-void	startnewtape __P((int top));
-void	trewind __P((void));
-void	writerec __P((char *dp, int isspcl));
+int	alloctape(void);
+void	close_rewind(void);
+void	dumpblock(daddr_t blkno, int size);
+void	startnewtape(int top);
+void	trewind(void);
+void	writerec(char *dp, int isspcl);
 
-__dead void Exit __P((int status));
-void	dumpabort __P((int signo));
-void	getfstab __P((void));
+__dead void Exit(int status);
+void	dumpabort(int signo);
+void	getfstab(void);
 
-char	*rawname __P((char *cp));
-struct	dinode *getino __P((ino_t inum));
+char	*rawname(char *cp);
+struct	dinode *getino(ino_t inum);
 
 /* rdump routines */
 #ifdef RDUMP
-void	rmtclose __P((void));
-int	rmthost __P((char *host));
-int	rmtopen __P((char *tape, int mode));
-int	rmtwrite __P((char *buf, int count));
+void	rmtclose(void);
+int	rmthost(char *host);
+int	rmtopen(char *tape, int mode);
+int	rmtwrite(char *buf, int count);
 #endif /* RDUMP */
 
-void	interrupt __P((int signo));	/* in case operator bangs on console */
+void	interrupt(int signo);	/* in case operator bangs on console */
 
 /*
  *	Exit status codes
@@ -155,7 +155,7 @@ void	interrupt __P((int signo));	/* in case operator bangs on console */
 
 #define	OPGRENT	"operator"		/* group entry to notify */
 
-struct	fstab *fstabsearch __P((char *key));	/* search fs_file and fs_spec */
+struct	fstab *fstabsearch(char *key);	/* search fs_file and fs_spec */
 
 #ifndef NAME_MAX
 #define NAME_MAX 255
@@ -178,13 +178,13 @@ struct	dumptime *dthead;	/* head of the list version */
 int	nddates;		/* number of records (might be zero) */
 int	ddates_in;		/* we have read the increment file */
 struct	dumpdates **ddatev;	/* the arrayfied version */
-void	initdumptimes __P((void));
-void	getdumptime __P((void));
-void	putdumptime __P((void));
+void	initdumptimes(void);
+void	getdumptime(void);
+void	putdumptime(void);
 #define	ITITERATE(i, ddp) \
 	for (ddp = ddatev[i = 0]; i < nddates; ddp = ddatev[++i])
 
-void	sig __P((int signo));
+void	sig(int signo);
 
 /*
  * Compatibility with old systems.
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index 60440087148..dc0e1a854c1 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dumprmt.c,v 1.15 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: dumprmt.c,v 1.16 2002/02/16 21:27:33 millert Exp $	*/
 /*	$NetBSD: dumprmt.c,v 1.17 1997/06/05 16:10:47 mrg Exp $	*/
 
 /*-
@@ -83,13 +83,13 @@ static	int rmtstate = TS_CLOSED;
 static	int rmtape;
 static	char *rmtpeer;
 
-static	int okname __P((char *));
-static	int rmtcall __P((char *, char *));
-static	void rmtconnaborted __P((/* int, int */));
-static	int rmtgetb __P((void));
-static	void rmtgetconn __P((void));
-static	void rmtgets __P((char *, int));
-static	int rmtreply __P((char *));
+static	int okname(char *);
+static	int rmtcall(char *, char *);
+static	void rmtconnaborted(/* int, int */);
+static	int rmtgetb(void);
+static	void rmtgetconn(void);
+static	void rmtgets(char *, int);
+static	int rmtreply(char *);
 
 extern	int ntrec;		/* blocking factor on tape */
 
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index 8a279c52ddc..8662b4a3265 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: itime.c,v 1.6 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: itime.c,v 1.7 2002/02/16 21:27:33 millert Exp $	*/
 /*	$NetBSD: itime.c,v 1.4 1997/04/15 01:09:50 lukem Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)itime.c	8.1 (Berkeley) 6/5/93";
 #else
-static char rcsid[] = "$OpenBSD: itime.c,v 1.6 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: itime.c,v 1.7 2002/02/16 21:27:33 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -73,10 +73,10 @@ int	nddates = 0;
 int	ddates_in = 0;
 struct	dumptime *dthead = 0;
 
-static	void dumprecout __P((FILE *, struct dumpdates *));
-static	int getrecord __P((FILE *, struct dumpdates *));
-static	int makedumpdate __P((struct dumpdates *, char *));
-static	void readdumptimes __P((FILE *));
+static	void dumprecout(FILE *, struct dumpdates *);
+static	int getrecord(FILE *, struct dumpdates *);
+static	int makedumpdate(struct dumpdates *, char *);
+static	void readdumptimes(FILE *);
 
 void
 initdumptimes()
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 900ab39fe01..6f8d389b3b3 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.30 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: main.c,v 1.31 2002/02/16 21:27:33 millert Exp $	*/
 /*	$NetBSD: main.c,v 1.14 1997/06/05 11:13:24 lukem Exp $	*/
 
 /*-
@@ -95,9 +95,9 @@ long	blocksperfile;	/* output blocks per file */
 char	*host = NULL;	/* remote host (if any) */
 int	maxbsize = 64*1024;	/* XXX MAXBSIZE from sys/param.h */
 
-static long numarg __P((char *, long, long));
-static void obsolete __P((int *, char **[]));
-static void usage __P((void));
+static long numarg(char *, long, long);
+static void obsolete(int *, char **[]);
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 66ccb918356..54c242dfa90 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: optr.c,v 1.19 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: optr.c,v 1.20 2002/02/16 21:27:33 millert Exp $	*/
 /*	$NetBSD: optr.c,v 1.11 1997/05/27 08:34:36 mrg Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)optr.c	8.2 (Berkeley) 1/6/94";
 #else
-static char rcsid[] = "$OpenBSD: optr.c,v 1.19 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: optr.c,v 1.20 2002/02/16 21:27:33 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -68,8 +68,8 @@ static char rcsid[] = "$OpenBSD: optr.c,v 1.19 2001/11/05 07:39:16 mpech Exp $";
 #include "dump.h"
 #include "pathnames.h"
 
-void	alarmcatch __P((/* int, int */));
-int	datesort __P((const void *, const void *));
+void	alarmcatch(/* int, int */);
+int	datesort(const void *, const void *);
 
 /*
  *	Query the operator; This previously-fascist piece of code
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 309c02c54ae..929cc65d5c1 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tape.c,v 1.12 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: tape.c,v 1.13 2002/02/16 21:27:33 millert Exp $	*/
 /*	$NetBSD: tape.c,v 1.11 1997/06/05 11:13:26 lukem Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)tape.c	8.2 (Berkeley) 3/17/94";
 #else
-static char rcsid[] = "$OpenBSD: tape.c,v 1.12 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: tape.c,v 1.13 2002/02/16 21:27:33 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -86,11 +86,11 @@ extern	char *host;
 char	*nexttape;
 
 static	ssize_t atomic __P((ssize_t (*)(), int, char *, int));
-static	void doslave __P((int, int));
-static	void enslave __P((void));
-static	void flushtape __P((void));
-static	void killall __P((void));
-static	void rollforward __P((void));
+static	void doslave(int, int);
+static	void enslave(void);
+static	void flushtape(void);
+static	void killall(void);
+static	void rollforward(void);
 
 /*
  * Concurrent dump mods (Caltech) - disk block reading and tape writing
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 409495aaee2..7f6274d7231 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: traverse.c,v 1.7 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: traverse.c,v 1.8 2002/02/16 21:27:33 millert Exp $	*/
 /*	$NetBSD: traverse.c,v 1.17 1997/06/05 11:13:27 lukem Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)traverse.c	8.2 (Berkeley) 9/23/93";
 #else
-static char rcsid[] = "$OpenBSD: traverse.c,v 1.7 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: traverse.c,v 1.8 2002/02/16 21:27:33 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -79,9 +79,9 @@ typedef	quad_t fsizeT;
 typedef	int32_t fsizeT;
 #endif
 
-static	int dirindir __P((ino_t ino, daddr_t blkno, int level, long *size));
-static	void dmpindir __P((ino_t ino, daddr_t blk, int level, fsizeT *size));
-static	int searchdir __P((ino_t ino, daddr_t blkno, long size, long filesize));
+static	int dirindir(ino_t ino, daddr_t blkno, int level, long *size);
+static	void dmpindir(ino_t ino, daddr_t blk, int level, fsizeT *size);
+static	int searchdir(ino_t ino, daddr_t blkno, long size, long filesize);
 
 /*
  * This is an estimation of the number of TP_BSIZE blocks in the file.
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index 72871516e9a..71e789c6462 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dumpfs.c,v 1.13 2001/12/01 19:13:21 deraadt Exp $	*/
+/*	$OpenBSD: dumpfs.c,v 1.14 2002/02/16 21:27:33 millert Exp $	*/
 /*	$NetBSD: dumpfs.c,v 1.12 1997/04/26 05:41:33 lukem Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)dumpfs.c	8.2 (Berkeley) 2/2/94";
 #else
-static char rcsid[] = "$OpenBSD: dumpfs.c,v 1.13 2001/12/01 19:13:21 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: dumpfs.c,v 1.14 2002/02/16 21:27:33 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -77,10 +77,10 @@ union {
 
 long	dev_bsize = 1;
 
-int	dumpfs __P((char *));
-int	dumpcg __P((char *, int, int));
-void	pbits __P((void *, int));
-void	usage __P((void));
+int	dumpfs(char *);
+int	dumpcg(char *, int, int);
+void	pbits(void *, int);
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/dumplfs/dumplfs.c b/sbin/dumplfs/dumplfs.c
index 2bddb5387ca..4770963d186 100644
--- a/sbin/dumplfs/dumplfs.c
+++ b/sbin/dumplfs/dumplfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dumplfs.c,v 1.5 2001/06/04 14:59:48 mickey Exp $	*/
+/*	$OpenBSD: dumplfs.c,v 1.6 2002/02/16 21:27:33 millert Exp $	*/
 /*	$NetBSD: dumplfs.c,v 1.7 1995/12/14 22:36:34 thorpej Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)dumplfs.c	8.1 (Berkeley) 6/5/93";
 #else
-static char rcsid[] = "$OpenBSD: dumplfs.c,v 1.5 2001/06/04 14:59:48 mickey Exp $";
+static char rcsid[] = "$OpenBSD: dumplfs.c,v 1.6 2002/02/16 21:27:33 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -66,16 +66,16 @@ static char rcsid[] = "$OpenBSD: dumplfs.c,v 1.5 2001/06/04 14:59:48 mickey Exp
 #include <unistd.h>
 #include "extern.h"
 
-static void	addseg __P((char *));
-static void	dump_cleaner_info __P((struct lfs *, void *));
-static void	dump_dinode __P((struct dinode *));
-static void	dump_ifile __P((int, struct lfs *, int));
-static int	dump_ipage_ifile __P((int, IFILE *, int));
-static int	dump_ipage_segusage __P((struct lfs *, int, IFILE *, int));
-static void	dump_segment __P((int, int, daddr_t, struct lfs *, int));
-static int	dump_sum __P((int, struct lfs *, SEGSUM *, int, daddr_t));
-static void	dump_super __P((struct lfs *));
-static void	usage __P((void));
+static void	addseg(char *);
+static void	dump_cleaner_info(struct lfs *, void *);
+static void	dump_dinode(struct dinode *);
+static void	dump_ifile(int, struct lfs *, int);
+static int	dump_ipage_ifile(int, IFILE *, int);
+static int	dump_ipage_segusage(struct lfs *, int, IFILE *, int);
+static void	dump_segment(int, int, daddr_t, struct lfs *, int);
+static int	dump_sum(int, struct lfs *, SEGSUM *, int, daddr_t);
+static void	dump_super(struct lfs *);
+static void	usage(void);
 
 typedef struct seglist SEGLIST;
 struct seglist {
diff --git a/sbin/dumplfs/extern.h b/sbin/dumplfs/extern.h
index b1941363838..f31b51bac61 100644
--- a/sbin/dumplfs/extern.h
+++ b/sbin/dumplfs/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.2 1996/06/23 14:30:19 deraadt Exp $	*/
+/*	$OpenBSD: extern.h,v 1.3 2002/02/16 21:27:33 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.3 1995/03/18 14:55:22 cgd Exp $	*/
 
 /*-
@@ -36,6 +36,6 @@
  *	@(#)extern.h	8.1 (Berkeley) 6/5/93
  */
 
-void	get __P((int, off_t, void *, size_t));
+void	get(int, off_t, void *, size_t);
 
 extern char *special;
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 */
 
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 61fbe4e4ad0..06db7f96338 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsck.c,v 1.7 2001/07/07 18:26:11 deraadt Exp $	*/
+/*	$OpenBSD: fsck.c,v 1.8 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: fsck.c,v 1.7 1996/10/03 20:06:30 christos Exp $	*/
 
 /*
@@ -74,19 +74,19 @@ static int maxrun = 0;
 static char *options = NULL;
 static int flags = 0;
 
-int main __P((int, char *[]));
+int main(int, char *[]);
 
 static int checkfs __P((const char *, const char *, const char *, void *,
     pid_t *));
-static int selected __P((const char *));
-static void addoption __P((char *));
-static const char *getoptions __P((const char *));
-static void addentry __P((struct fstypelist *, const char *, const char *));
-static void maketypelist __P((char *));
-static char *catopt __P((char *, const char *, int));
-static void mangle __P((char *, int *, const char ***, int *));
-static void usage __P((void));
-static void *isok __P((struct fstab *));
+static int selected(const char *);
+static void addoption(char *);
+static const char *getoptions(const char *);
+static void addentry(struct fstypelist *, const char *, const char *);
+static void maketypelist(char *);
+static char *catopt(char *, const char *, int);
+static void mangle(char *, int *, const char ***, int *);
+static void usage(void);
+static void *isok(struct fstab *);
 
 
 int
diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index ecdc076ab31..accf55a4672 100644
--- a/sbin/fsck/fsutil.c
+++ b/sbin/fsck/fsutil.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsutil.c,v 1.4 2001/07/03 13:03:44 ian Exp $	*/
+/*	$OpenBSD: fsutil.c,v 1.5 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: fsutil.c,v 1.2 1996/10/03 20:06:31 christos Exp $	*/
 
 /*
@@ -60,7 +60,7 @@ static int preen = 0;
 
 extern char *__progname;
 
-static void vmsg __P((int, const char *, va_list));
+static void vmsg(int, const char *, va_list);
 
 void
 setcdevname(cd, pr)
diff --git a/sbin/fsck/fsutil.h b/sbin/fsck/fsutil.h
index e185fc7e901..038223c42ba 100644
--- a/sbin/fsck/fsutil.h
+++ b/sbin/fsck/fsutil.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsutil.h,v 1.1 1996/10/20 08:36:25 tholo Exp $	*/
+/*	$OpenBSD: fsutil.h,v 1.2 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: fsutil.h,v 1.3 1996/10/03 20:06:31 christos Exp $	*/
 
 /*
@@ -30,24 +30,24 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-void perror __P((const char *));
-void errexit __P((const char *, ...))
+void perror(const char *);
+void errexit(const char *, ...)
     __attribute__((__noreturn__,__format__(__printf__,1,2)));  
-void pfatal __P((const char *, ...))
+void pfatal(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));  
-void pwarn __P((const char *, ...))
+void pwarn(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));  
-void panic __P((const char *, ...))
+void panic(const char *, ...)
     __attribute__((__noreturn__,__format__(__printf__,1,2)));  
-char *rawname __P((char *));
-char *unrawname __P((char *));
-char *blockcheck __P((char *));
-const char *cdevname __P((void));
-void setcdevname __P((const char *, int));
-int  hotroot __P((void));
-void *emalloc __P((size_t));
-void *erealloc __P((void *, size_t));
-char *estrdup __P((const char *));
+char *rawname(char *);
+char *unrawname(char *);
+char *blockcheck(char *);
+const char *cdevname(void);
+void setcdevname(const char *, int);
+int  hotroot(void);
+void *emalloc(size_t);
+void *erealloc(void *, size_t);
+char *estrdup(const char *);
 
 #define CHECK_PREEN	1
 #define	CHECK_VERBOSE	2
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index 8d792407310..137730c5c1e 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: preen.c,v 1.6 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: preen.c,v 1.7 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: preen.c,v 1.15 1996/09/28 19:21:42 christos Exp $	*/
 
 /*
@@ -78,16 +78,16 @@ TAILQ_HEAD(disk, diskentry) diskh;
 
 static int nrun = 0, ndisks = 0;
 
-static struct diskentry *finddisk __P((const char *));
-static void addpart __P((const char *, const char *, const char *, void *));
+static struct diskentry *finddisk(const char *);
+static void addpart(const char *, const char *, const char *, void *);
 static int startdisk __P((struct diskentry *, 
     int (*)(const char *, const char *, const char *, void *, pid_t *)));
-static void printpart __P((void));
+static void printpart(void);
 
 int
 checkfstab(flags, maxrun, docheck, checkit)
 	int flags, maxrun;
-	void *(*docheck) __P((struct fstab *));
+	void *(*docheck)(struct fstab *);
 	int (*checkit) __P((const char *, const char *, const char *, void *,
 	    pid_t *));
 {
diff --git a/sbin/fsck_ext2fs/dir.c b/sbin/fsck_ext2fs/dir.c
index 610dc1d3c64..21159556a7e 100644
--- a/sbin/fsck_ext2fs/dir.c
+++ b/sbin/fsck_ext2fs/dir.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dir.c,v 1.6 2001/09/18 17:43:15 art Exp $	*/
+/*	$OpenBSD: dir.c,v 1.7 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: dir.c,v 1.5 2000/01/28 16:01:46 bouyer Exp $	*/
 
 /*
@@ -61,13 +61,13 @@ struct	ext2fs_dirtemplate dirhead = {
 };
 #undef DIRBLKSIZ
 
-static int expanddir __P((struct ext2fs_dinode *, char *));
-static void freedir __P((ino_t, ino_t));
-static struct ext2fs_direct *fsck_readdir __P((struct inodesc *));
-static struct bufarea *getdirblk __P((daddr_t, long));
-static int lftempname __P((char *, ino_t));
-static int mkentry __P((struct inodesc *));
-static int chgino __P((struct  inodesc *));
+static int expanddir(struct ext2fs_dinode *, char *);
+static void freedir(ino_t, ino_t);
+static struct ext2fs_direct *fsck_readdir(struct inodesc *);
+static struct bufarea *getdirblk(daddr_t, long);
+static int lftempname(char *, ino_t);
+static int mkentry(struct inodesc *);
+static int chgino(struct  inodesc *);
 
 /*
  * Propagate connected state through the tree.
diff --git a/sbin/fsck_ext2fs/extern.h b/sbin/fsck_ext2fs/extern.h
index 46c5bee9945..782d63f269b 100644
--- a/sbin/fsck_ext2fs/extern.h
+++ b/sbin/fsck_ext2fs/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.3 1997/06/14 04:16:51 downsj Exp $	*/
+/*	$OpenBSD: extern.h,v 1.4 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.1 1997/06/11 11:21:46 bouyer Exp $	*/
 
 /*
@@ -26,51 +26,51 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-void	adjust __P((struct inodesc *, short));
-int	allocblk __P((void));
-int	allocdir __P((ino_t, ino_t, int));
-void	blkerror __P((ino_t, char *, daddr_t));
-int	bread __P((int, char *, daddr_t, long));
-void	bufinit __P((void));
-void	bwrite __P((int, char *, daddr_t, long));
-void	cacheino __P((struct ext2fs_dinode *, ino_t));
-int	changeino __P((ino_t, char *, ino_t));
+void	adjust(struct inodesc *, short);
+int	allocblk(void);
+int	allocdir(ino_t, ino_t, int);
+void	blkerror(ino_t, char *, daddr_t);
+int	bread(int, char *, daddr_t, long);
+void	bufinit(void);
+void	bwrite(int, char *, daddr_t, long);
+void	cacheino(struct ext2fs_dinode *, ino_t);
+int	changeino(ino_t, char *, ino_t);
 struct	fstab;
-int	chkrange __P((daddr_t, int));
-void	ckfini __P((int));
-int	ckinode __P((struct ext2fs_dinode *, struct inodesc *));
-void	clri __P((struct inodesc *, char *, int));
-int	dircheck __P((struct inodesc *, struct ext2fs_direct *));
-void	direrror __P((ino_t, char *));
-int	dirscan __P((struct inodesc *));
-int	dofix __P((struct inodesc *, char *));
-void	fileerror __P((ino_t, ino_t, char *));
-int	findino __P((struct inodesc *));
-int	findname __P((struct inodesc *));
-void	flush __P((int, struct bufarea *));
-void	freeblk __P((daddr_t));
-void	freeino __P((ino_t));
-void	freeinodebuf __P((void));
-int	ftypeok __P((struct ext2fs_dinode *));
-void	getpathname __P((char *, ino_t, ino_t));
-void	inocleanup __P((void));
-void	inodirty __P((void));
-int	linkup __P((ino_t, ino_t));
-int	makeentry __P((ino_t, ino_t, char *));
-void	pass1 __P((void));
-void	pass1b __P((void));
-void	pass2 __P((void));
-void	pass3 __P((void));
-void	pass4 __P((void));
-int	pass1check __P((struct inodesc *));
-int	pass4check __P((struct inodesc *));
-void	pass5 __P((void));
-void	pinode __P((ino_t));
-void	propagate __P((void));
-int	reply __P((char *));
-void	resetinodebuf __P((void));
-int	setup __P((char *));
-struct	ext2fs_dinode * getnextinode __P((ino_t));
-void	catch __P((int));
-void	catchquit __P((int));
-void	voidquit __P((int));
+int	chkrange(daddr_t, int);
+void	ckfini(int);
+int	ckinode(struct ext2fs_dinode *, struct inodesc *);
+void	clri(struct inodesc *, char *, int);
+int	dircheck(struct inodesc *, struct ext2fs_direct *);
+void	direrror(ino_t, char *);
+int	dirscan(struct inodesc *);
+int	dofix(struct inodesc *, char *);
+void	fileerror(ino_t, ino_t, char *);
+int	findino(struct inodesc *);
+int	findname(struct inodesc *);
+void	flush(int, struct bufarea *);
+void	freeblk(daddr_t);
+void	freeino(ino_t);
+void	freeinodebuf(void);
+int	ftypeok(struct ext2fs_dinode *);
+void	getpathname(char *, ino_t, ino_t);
+void	inocleanup(void);
+void	inodirty(void);
+int	linkup(ino_t, ino_t);
+int	makeentry(ino_t, ino_t, char *);
+void	pass1(void);
+void	pass1b(void);
+void	pass2(void);
+void	pass3(void);
+void	pass4(void);
+int	pass1check(struct inodesc *);
+int	pass4check(struct inodesc *);
+void	pass5(void);
+void	pinode(ino_t);
+void	propagate(void);
+int	reply(char *);
+void	resetinodebuf(void);
+int	setup(char *);
+struct	ext2fs_dinode * getnextinode(ino_t);
+void	catch(int);
+void	catchquit(int);
+void	voidquit(int);
diff --git a/sbin/fsck_ext2fs/fsck.h b/sbin/fsck_ext2fs/fsck.h
index 63a3b45a683..5b2275adcb0 100644
--- a/sbin/fsck_ext2fs/fsck.h
+++ b/sbin/fsck_ext2fs/fsck.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsck.h,v 1.4 2000/04/26 23:26:05 jasoni Exp $	*/
+/*	$OpenBSD: fsck.h,v 1.5 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: fsck.h,v 1.1 1997/06/11 11:21:47 bouyer Exp $	*/
 
 /*
@@ -81,7 +81,7 @@ struct bufarea sblk;		/* file system superblock */
 struct bufarea asblk;		/* first alternate superblock */
 struct bufarea *pdirbp;		/* current directory contents */
 struct bufarea *pbp;		/* current inode block */
-struct bufarea *getdatablk __P((daddr_t, long));
+struct bufarea *getdatablk(daddr_t, long);
 struct m_ext2fs sblock;
 
 #define	dirty(bp)	(bp)->b_dirty = 1
@@ -97,7 +97,7 @@ enum fixstate {DONTKNOW, NOFIX, FIX, IGNORE};
 struct inodesc {
 	enum fixstate id_fix;	/* policy on fixing errors */
 	int (*id_func)		/* function to be applied to blocks of inode */
-	    __P((struct inodesc *));
+(struct inodesc *);
 	ino_t id_number;	/* inode number described */
 	ino_t id_parent;	/* for DATA nodes, their parent */
 	daddr_t id_blkno;	/* current block number being examined */
@@ -207,9 +207,9 @@ struct	ext2fs_dinode zino;
 #define	ALTERED	0x08
 #define	FOUND	0x10
 
-struct ext2fs_dinode *ginode __P((ino_t));
-struct inoinfo *getinoinfo __P((ino_t));
-void getblk __P((struct bufarea *, daddr_t, long));
-ino_t allocino __P((ino_t, int));
-void copyback_sb __P((struct bufarea*));
-daddr_t cgoverhead __P((int));	/* overhead per cg */
+struct ext2fs_dinode *ginode(ino_t);
+struct inoinfo *getinoinfo(ino_t);
+void getblk(struct bufarea *, daddr_t, long);
+ino_t allocino(ino_t, int);
+void copyback_sb(struct bufarea*);
+daddr_t cgoverhead(int);	/* overhead per cg */
diff --git a/sbin/fsck_ext2fs/inode.c b/sbin/fsck_ext2fs/inode.c
index 387c5ea2514..c6e97e2ca5c 100644
--- a/sbin/fsck_ext2fs/inode.c
+++ b/sbin/fsck_ext2fs/inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inode.c,v 1.8 2001/09/18 17:43:15 art Exp $	*/
+/*	$OpenBSD: inode.c,v 1.9 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: inode.c,v 1.8 2000/01/28 16:01:46 bouyer Exp $	*/
 
 /*
@@ -65,7 +65,7 @@
 
 static ino_t startinum;
 
-static int iblock __P((struct inodesc *, long, u_int64_t));
+static int iblock(struct inodesc *, long, u_int64_t);
 
 int
 ckinode(dp, idesc)
@@ -162,7 +162,7 @@ iblock(idesc, ilevel, isize)
 	daddr_t *ap;
 	daddr_t *aplim;
 	struct bufarea *bp;
-	int i, n, (*func) __P((struct inodesc *)), nif;
+	int i, n, (*func)(struct inodesc *), nif;
 	u_int64_t sizepb;
 	char buf[BUFSIZ];
 	char pathbuf[MAXPATHLEN + 1];
diff --git a/sbin/fsck_ext2fs/main.c b/sbin/fsck_ext2fs/main.c
index 5806a97dd3d..cecfe2ff6b2 100644
--- a/sbin/fsck_ext2fs/main.c
+++ b/sbin/fsck_ext2fs/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.7 2000/04/26 23:26:06 jasoni Exp $	*/
+/*	$OpenBSD: main.c,v 1.8 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: main.c,v 1.1 1997/06/11 11:21:50 bouyer Exp $	*/
 
 /*
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 1/23/94";
 #if 0
 static char rcsid[] = "$NetBSD: main.c,v 1.1 1997/06/11 11:21:50 bouyer Exp $";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.7 2000/04/26 23:26:06 jasoni Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.8 2002/02/16 21:27:34 millert Exp $";
 #endif
 #endif
 #endif /* not lint */
@@ -72,11 +72,11 @@ static char rcsid[] = "$OpenBSD: main.c,v 1.7 2000/04/26 23:26:06 jasoni Exp $";
 
 int	returntosingle;
 
-int	main __P((int, char *[]));
+int	main(int, char *[]);
 
-static int	argtoi __P((int, char *, char *, int));
-static int	checkfilesys __P((char *, char *, long, int));
-static  void usage __P((void));
+static int	argtoi(int, char *, char *, int);
+static int	checkfilesys(char *, char *, long, int);
+static  void usage(void);
 
 
 int
diff --git a/sbin/fsck_ext2fs/pass1.c b/sbin/fsck_ext2fs/pass1.c
index b9dd16644e4..bd99eabaf0b 100644
--- a/sbin/fsck_ext2fs/pass1.c
+++ b/sbin/fsck_ext2fs/pass1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass1.c,v 1.6 2001/09/18 17:43:15 art Exp $	*/
+/*	$OpenBSD: pass1.c,v 1.7 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: pass1.c,v 1.9 2000/01/31 11:40:12 bouyer Exp $	*/
 
 /*
@@ -54,7 +54,7 @@
 
 static daddr_t badblk;
 static daddr_t dupblk;
-static void checkinode __P((ino_t, struct inodesc *));
+static void checkinode(ino_t, struct inodesc *);
 
 void
 pass1()
diff --git a/sbin/fsck_ext2fs/pass1b.c b/sbin/fsck_ext2fs/pass1b.c
index f10f36acbf1..4051694d756 100644
--- a/sbin/fsck_ext2fs/pass1b.c
+++ b/sbin/fsck_ext2fs/pass1b.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass1b.c,v 1.4 2001/09/18 17:43:15 art Exp $	*/
+/*	$OpenBSD: pass1b.c,v 1.5 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: pass1b.c,v 1.2 1997/09/14 14:27:26 lukem Exp $	*/
 
 /*
@@ -44,7 +44,7 @@
 #include "fsck.h"
 #include "extern.h"
 
-static int	pass1bcheck __P((struct inodesc *));
+static int	pass1bcheck(struct inodesc *);
 static  struct dups *duphead;
 
 void
diff --git a/sbin/fsck_ext2fs/pass2.c b/sbin/fsck_ext2fs/pass2.c
index 47657dfbc2c..a2da0883e51 100644
--- a/sbin/fsck_ext2fs/pass2.c
+++ b/sbin/fsck_ext2fs/pass2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass2.c,v 1.5 2001/09/18 17:43:15 art Exp $	*/
+/*	$OpenBSD: pass2.c,v 1.6 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: pass2.c,v 1.6 2000/01/28 16:01:46 bouyer Exp $	*/
 
 /*
@@ -53,8 +53,8 @@
 
 #define MINDIRSIZE	(sizeof (struct ext2fs_dirtemplate))
 
-static int pass2check __P((struct inodesc *));
-static int blksort __P((const void *, const void *));
+static int pass2check(struct inodesc *);
+static int blksort(const void *, const void *);
 
 void
 pass2()
diff --git a/sbin/fsck_ext2fs/pass5.c b/sbin/fsck_ext2fs/pass5.c
index 060c3237d32..f1793dc7331 100644
--- a/sbin/fsck_ext2fs/pass5.c
+++ b/sbin/fsck_ext2fs/pass5.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass5.c,v 1.8 2001/09/18 17:43:15 art Exp $	*/
+/*	$OpenBSD: pass5.c,v 1.9 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: pass5.c,v 1.7 2000/01/28 16:01:46 bouyer Exp $ */
 
 /*
@@ -50,7 +50,7 @@
 #include "extern.h"
 
 
-void print_bmap __P((u_char *,u_int32_t));
+void print_bmap(u_char *,u_int32_t);
 
 void
 pass5()
diff --git a/sbin/fsck_ext2fs/preen.c b/sbin/fsck_ext2fs/preen.c
index 2ea22ddb1e9..e6a3ee7e6be 100644
--- a/sbin/fsck_ext2fs/preen.c
+++ b/sbin/fsck_ext2fs/preen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: preen.c,v 1.4 2001/09/18 17:43:15 art Exp $	*/
+/*	$OpenBSD: preen.c,v 1.5 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: preen.c,v 1.2 1997/09/14 14:27:30 lukem Exp $	*/
 
 /*
@@ -63,7 +63,7 @@ int	nrun, ndisks;
 char	hotroot;
 
 char	*rawname(), *unrawname(), *blockcheck();
-void addpart __P((char *, char *, long));
+void addpart(char *, char *, long);
 int startdisk __P((struct disk *, int (*)() ));
 
 int
diff --git a/sbin/fsck_ext2fs/setup.c b/sbin/fsck_ext2fs/setup.c
index 13f82b16d1e..b42913f448a 100644
--- a/sbin/fsck_ext2fs/setup.c
+++ b/sbin/fsck_ext2fs/setup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setup.c,v 1.7 2001/09/18 17:43:15 art Exp $	*/
+/*	$OpenBSD: setup.c,v 1.8 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: setup.c,v 1.1 1997/06/11 11:22:01 bouyer Exp $	*/
 
 /*
@@ -58,10 +58,10 @@
 
 #define POWEROF2(num)	(((num) & ((num) - 1)) == 0)
 
-void badsb __P((int, char *));
-int calcsb __P((char *, int, struct m_ext2fs *));
-static struct disklabel *getdisklabel __P((char *, int));
-static int readsb __P((int));
+void badsb(int, char *);
+int calcsb(char *, int, struct m_ext2fs *);
+static struct disklabel *getdisklabel(char *, int);
+static int readsb(int);
 
 int
 setup(dev)
diff --git a/sbin/fsck_ext2fs/utilities.c b/sbin/fsck_ext2fs/utilities.c
index c0eca929756..b06c4a5452c 100644
--- a/sbin/fsck_ext2fs/utilities.c
+++ b/sbin/fsck_ext2fs/utilities.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: utilities.c,v 1.9 2001/09/18 17:43:15 art Exp $	*/
+/*	$OpenBSD: utilities.c,v 1.10 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: utilities.c,v 1.6 2001/02/04 21:19:34 christos Exp $	*/
 
 /*
@@ -53,7 +53,7 @@
 
 long	diskreads, totalreads;	/* Disk cache statistics */
 
-static void rwerror __P((char *, daddr_t));
+static void rwerror(char *, daddr_t);
 
 extern int returntosingle;
 
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c
index 622b11d032d..30910fe2db6 100644
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dir.c,v 1.10 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: dir.c,v 1.11 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: dir.c,v 1.20 1996/09/27 22:45:11 christos Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)dir.c	8.5 (Berkeley) 12/8/94";
 #else
-static char rcsid[] = "$OpenBSD: dir.c,v 1.10 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: dir.c,v 1.11 2002/02/16 21:27:34 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -68,13 +68,13 @@ struct	odirtemplate odirhead = {
 	0, DIRBLKSIZ - 12, 2, ".."
 };
 
-static int expanddir __P((struct dinode *, char *));
-static void freedir __P((ino_t, ino_t));
-static struct direct *fsck_readdir __P((struct inodesc *));
-static struct bufarea *getdirblk __P((daddr_t, long));
-static int lftempname __P((char *, ino_t));
-static int mkentry __P((struct inodesc *));
-static int chgino __P((struct  inodesc *));
+static int expanddir(struct dinode *, char *);
+static void freedir(ino_t, ino_t);
+static struct direct *fsck_readdir(struct inodesc *);
+static struct bufarea *getdirblk(daddr_t, long);
+static int lftempname(char *, ino_t);
+static int mkentry(struct inodesc *);
+static int chgino(struct  inodesc *);
 
 /*
  * Propagate connected state through the tree.
diff --git a/sbin/fsck_ffs/extern.h b/sbin/fsck_ffs/extern.h
index 45e9c080e15..5ac4e5c2672 100644
--- a/sbin/fsck_ffs/extern.h
+++ b/sbin/fsck_ffs/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.5 2001/05/28 21:22:47 gluk Exp $	*/
+/*	$OpenBSD: extern.h,v 1.6 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.6 1996/09/27 22:45:12 christos Exp $	*/
 
 /*
@@ -25,52 +25,52 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-void	adjust __P((struct inodesc *, short));
-int	allocblk __P((long));
-int	allocdir __P((ino_t, ino_t, int));
-void	blkerror __P((ino_t, char *, daddr_t));
-int	bread __P((int, char *, daddr_t, long));
-void	bufinit __P((void));
-void	bwrite __P((int, char *, daddr_t, long));
-void	cacheino __P((struct dinode *, ino_t));
-int	changeino __P((ino_t, char *, ino_t));
+void	adjust(struct inodesc *, short);
+int	allocblk(long);
+int	allocdir(ino_t, ino_t, int);
+void	blkerror(ino_t, char *, daddr_t);
+int	bread(int, char *, daddr_t, long);
+void	bufinit(void);
+void	bwrite(int, char *, daddr_t, long);
+void	cacheino(struct dinode *, ino_t);
+int	changeino(ino_t, char *, ino_t);
 struct	fstab;
-int	chkrange __P((daddr_t, int));
-void	ckfini __P((int));
-int	ckinode __P((struct dinode *, struct inodesc *));
-void	clri __P((struct inodesc *, char *, int));
-int	dircheck __P((struct inodesc *, struct direct *));
-void	direrror __P((ino_t, char *));
-int	dirscan __P((struct inodesc *));
-int	dofix __P((struct inodesc *, char *));
-void	fileerror __P((ino_t, ino_t, char *));
-int	findino __P((struct inodesc *));
-int	findname __P((struct inodesc *));
-void	flush __P((int, struct bufarea *));
-void	freeblk __P((daddr_t, long));
-void	freeino __P((ino_t));
-void	freeinodebuf __P((void));
-int	ftypeok __P((struct dinode *));
-void	getpathname __P((char *, ino_t, ino_t));
-void	inocleanup __P((void));
-void	inodirty __P((void));
-int	linkup __P((ino_t, ino_t));
-int	makeentry __P((ino_t, ino_t, char *));
-void	pass1 __P((void));
-void	pass1b __P((void));
-void	pass2 __P((void));
-void	pass3 __P((void));
-void	pass4 __P((void));
-int	pass1check __P((struct inodesc *));
-int	pass4check __P((struct inodesc *));
-void	pass5 __P((void));
-void	pinode __P((ino_t));
-void	propagate __P((ino_t));
-int	reply __P((char *));
-void	resetinodebuf __P((void));
-int	setup __P((char *));
-struct	dinode * getnextinode __P((ino_t));
-void	catch __P((int));
-void	catchquit __P((int));
-void	voidquit __P((int));
-void	catchinfo __P((int));
+int	chkrange(daddr_t, int);
+void	ckfini(int);
+int	ckinode(struct dinode *, struct inodesc *);
+void	clri(struct inodesc *, char *, int);
+int	dircheck(struct inodesc *, struct direct *);
+void	direrror(ino_t, char *);
+int	dirscan(struct inodesc *);
+int	dofix(struct inodesc *, char *);
+void	fileerror(ino_t, ino_t, char *);
+int	findino(struct inodesc *);
+int	findname(struct inodesc *);
+void	flush(int, struct bufarea *);
+void	freeblk(daddr_t, long);
+void	freeino(ino_t);
+void	freeinodebuf(void);
+int	ftypeok(struct dinode *);
+void	getpathname(char *, ino_t, ino_t);
+void	inocleanup(void);
+void	inodirty(void);
+int	linkup(ino_t, ino_t);
+int	makeentry(ino_t, ino_t, char *);
+void	pass1(void);
+void	pass1b(void);
+void	pass2(void);
+void	pass3(void);
+void	pass4(void);
+int	pass1check(struct inodesc *);
+int	pass4check(struct inodesc *);
+void	pass5(void);
+void	pinode(ino_t);
+void	propagate(ino_t);
+int	reply(char *);
+void	resetinodebuf(void);
+int	setup(char *);
+struct	dinode * getnextinode(ino_t);
+void	catch(int);
+void	catchquit(int);
+void	voidquit(int);
+void	catchinfo(int);
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index 9f1146b6a79..b169c5ed7b9 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsck.h,v 1.8 2001/03/02 08:33:55 art Exp $	*/
+/*	$OpenBSD: fsck.h,v 1.9 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: fsck.h,v 1.13 1996/10/11 20:15:46 thorpej Exp $	*/
 
 /*
@@ -80,7 +80,7 @@ struct bufarea sblk;		/* file system superblock */
 struct bufarea cgblk;		/* cylinder group blocks */
 struct bufarea *pdirbp;		/* current directory contents */
 struct bufarea *pbp;		/* current inode block */
-struct bufarea *getdatablk __P((daddr_t, long));
+struct bufarea *getdatablk(daddr_t, long);
 
 #define	dirty(bp)	(bp)->b_dirty = 1
 #define	initbarea(bp) \
@@ -98,7 +98,7 @@ enum fixstate {DONTKNOW, NOFIX, FIX, IGNORE};
 struct inodesc {
 	enum fixstate id_fix;	/* policy on fixing errors */
 	int (*id_func)		/* function to be applied to blocks of inode */
-	    __P((struct inodesc *));
+(struct inodesc *);
 	ino_t id_number;	/* inode number described */
 	ino_t id_parent;	/* for DATA nodes, their parent */
 	daddr_t id_blkno;	/* current block number being examined */
@@ -214,10 +214,10 @@ struct	dinode zino;
 #define	ALTERED	0x08
 #define	FOUND	0x10
 
-struct dinode *ginode __P((ino_t));
-struct inoinfo *getinoinfo __P((ino_t));
-void getblk __P((struct bufarea *, daddr_t, long));
-ino_t allocino __P((ino_t, int));
+struct dinode *ginode(ino_t);
+struct inoinfo *getinoinfo(ino_t);
+void getblk(struct bufarea *, daddr_t, long);
+ino_t allocino(ino_t, int);
 
 int	(*info_fn)(char *, int);
 char	*info_filesys;
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index 6b59bd22baf..0a51822c76c 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inode.c,v 1.18 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: inode.c,v 1.19 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: inode.c,v 1.23 1996/10/11 20:15:47 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)inode.c	8.5 (Berkeley) 2/8/95";
 #else
-static char rcsid[] = "$OpenBSD: inode.c,v 1.18 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: inode.c,v 1.19 2002/02/16 21:27:34 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -60,7 +60,7 @@ static char rcsid[] = "$OpenBSD: inode.c,v 1.18 2001/11/05 07:39:16 mpech Exp $"
 
 static ino_t startinum;
 
-static int iblock __P((struct inodesc *, long, u_int64_t));
+static int iblock(struct inodesc *, long, u_int64_t);
 
 int
 ckinode(dp, idesc)
@@ -161,7 +161,7 @@ iblock(idesc, ilevel, isize)
 	daddr_t *ap;
 	daddr_t *aplim;
 	struct bufarea *bp;
-	int i, n, (*func) __P((struct inodesc *)), nif;
+	int i, n, (*func)(struct inodesc *), nif;
 	u_int64_t sizepb;
 	char buf[BUFSIZ];
 	char pathbuf[MAXPATHLEN + 1];
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 7896b100683..01b6279742e 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.19 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: main.c,v 1.20 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: main.c,v 1.22 1996/10/11 20:15:48 thorpej Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 1/23/94";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.19 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.20 2002/02/16 21:27:34 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -65,10 +65,10 @@ static char rcsid[] = "$OpenBSD: main.c,v 1.19 2001/11/05 07:39:16 mpech Exp $";
 #include "fsutil.h"
 
 int	returntosingle;
-int	argtoi __P((int, char *, char *, int));
-int	checkfilesys __P((char *, char *, long, int));
-int	docheck __P((struct fstab *));
-int	main __P((int, char *[]));
+int	argtoi(int, char *, char *, int);
+int	checkfilesys(char *, char *, long, int);
+int	docheck(struct fstab *);
+int	main(int, char *[]);
 
 extern char *__progname;
 
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 5c94218a15d..0f8802abeed 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass1.c,v 1.10 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: pass1.c,v 1.11 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: pass1.c,v 1.16 1996/09/27 22:45:15 christos Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pass1.c	8.1 (Berkeley) 6/5/93";
 #else
-static char rcsid[] = "$OpenBSD: pass1.c,v 1.10 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: pass1.c,v 1.11 2002/02/16 21:27:34 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -58,7 +58,7 @@ static char rcsid[] = "$OpenBSD: pass1.c,v 1.10 2001/11/05 07:39:16 mpech Exp $"
 
 static daddr_t badblk;
 static daddr_t dupblk;
-static void checkinode __P((ino_t, struct inodesc *));
+static void checkinode(ino_t, struct inodesc *);
 
 static ino_t info_inumber;
 
diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c
index b2aea2d4778..5586c60dca5 100644
--- a/sbin/fsck_ffs/pass1b.c
+++ b/sbin/fsck_ffs/pass1b.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass1b.c,v 1.5 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: pass1b.c,v 1.6 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: pass1b.c,v 1.10 1996/09/23 16:18:37 christos Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pass1b.c	8.1 (Berkeley) 6/5/93";
 #else
-static char rcsid[] = "$OpenBSD: pass1b.c,v 1.5 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: pass1b.c,v 1.6 2002/02/16 21:27:34 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -52,7 +52,7 @@ static char rcsid[] = "$OpenBSD: pass1b.c,v 1.5 2001/11/05 07:39:16 mpech Exp $"
 #include "fsck.h"
 #include "extern.h"
 
-static int	pass1bcheck __P((struct inodesc *));
+static int	pass1bcheck(struct inodesc *);
 static  struct dups *duphead;
 
 static ino_t info_inumber;
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index e23d518db0d..c501666ebdd 100644
--- a/sbin/fsck_ffs/pass2.c
+++ b/sbin/fsck_ffs/pass2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass2.c,v 1.11 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: pass2.c,v 1.12 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: pass2.c,v 1.17 1996/09/27 22:45:15 christos Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pass2.c	8.6 (Berkeley) 10/27/94";
 #else
-static char rcsid[] = "$OpenBSD: pass2.c,v 1.11 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: pass2.c,v 1.12 2002/02/16 21:27:34 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -58,8 +58,8 @@ static char rcsid[] = "$OpenBSD: pass2.c,v 1.11 2001/11/05 07:39:16 mpech Exp $"
 
 #define MINDIRSIZE	(sizeof (struct dirtemplate))
 
-static int pass2check __P((struct inodesc *));
-static int blksort __P((const void *, const void *));
+static int pass2check(struct inodesc *);
+static int blksort(const void *, const void *);
 
 static int info_max;
 static int info_pos;
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index a11facb44d7..2e73760b81c 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setup.c,v 1.14 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: setup.c,v 1.15 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: setup.c,v 1.27 1996/09/27 22:45:19 christos Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)setup.c	8.5 (Berkeley) 11/23/94";
 #else
-static char rcsid[] = "$OpenBSD: setup.c,v 1.14 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: setup.c,v 1.15 2002/02/16 21:27:34 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -66,10 +66,10 @@ struct bufarea asblk;
 #define altsblock (*asblk.b_un.b_fs)
 #define POWEROF2(num)	(((num) & ((num) - 1)) == 0)
 
-void badsb __P((int, char *));
-int calcsb __P((char *, int, struct fs *));
-static struct disklabel *getdisklabel __P((char *, int));
-static int readsb __P((int));
+void badsb(int, char *);
+int calcsb(char *, int, struct fs *);
+static struct disklabel *getdisklabel(char *, int);
+static int readsb(int);
 
 int
 setup(dev)
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 86d69e65199..bfcbc0a3b9a 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: utilities.c,v 1.13 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: utilities.c,v 1.14 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: utilities.c,v 1.18 1996/09/27 22:45:20 christos Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)utilities.c	8.1 (Berkeley) 6/5/93";
 #else
-static char rcsid[] = "$OpenBSD: utilities.c,v 1.13 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: utilities.c,v 1.14 2002/02/16 21:27:34 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -64,7 +64,7 @@ static char rcsid[] = "$OpenBSD: utilities.c,v 1.13 2001/11/05 07:39:16 mpech Ex
 
 long	diskreads, totalreads;	/* Disk cache statistics */
 
-static void rwerror __P((char *, daddr_t));
+static void rwerror(char *, daddr_t);
 
 int
 ftypeok(dp)
diff --git a/sbin/fsck_msdos/dir.c b/sbin/fsck_msdos/dir.c
index 607f8001bd4..97002f579c3 100644
--- a/sbin/fsck_msdos/dir.c
+++ b/sbin/fsck_msdos/dir.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dir.c,v 1.13 2001/07/07 18:26:12 deraadt Exp $	*/
+/*	$OpenBSD: dir.c,v 1.14 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: dir.c,v 1.11 1997/10/17 11:19:35 ws Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
 
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: dir.c,v 1.13 2001/07/07 18:26:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: dir.c,v 1.14 2002/02/16 21:27:34 millert Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -91,12 +91,12 @@ static char rcsid[] = "$OpenBSD: dir.c,v 1.13 2001/07/07 18:26:12 deraadt Exp $"
 #define DD_YEAR_SHIFT		9
 
 /* dir.c */
-static struct dosDirEntry *newDosDirEntry __P((void));
-static void freeDosDirEntry __P((struct dosDirEntry *));
-static struct dirTodoNode *newDirTodo __P((void));
-static void freeDirTodo __P((struct dirTodoNode *));
-static char *fullpath __P((struct dosDirEntry *));
-static u_char calcShortSum __P((u_char *));
+static struct dosDirEntry *newDosDirEntry(void);
+static void freeDosDirEntry(struct dosDirEntry *);
+static struct dirTodoNode *newDirTodo(void);
+static void freeDirTodo(struct dirTodoNode *);
+static char *fullpath(struct dosDirEntry *);
+static u_char calcShortSum(u_char *);
 static int delete __P((int, struct bootblock *, struct fatEntry *, cl_t, int,
     cl_t, int, int));
 static int removede __P((int, struct bootblock *, struct fatEntry *, u_char *,
diff --git a/sbin/fsck_msdos/ext.h b/sbin/fsck_msdos/ext.h
index 5df7e5ecc70..98022d201af 100644
--- a/sbin/fsck_msdos/ext.h
+++ b/sbin/fsck_msdos/ext.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext.h,v 1.6 2001/09/19 10:58:07 mpech Exp $	*/
+/*	$OpenBSD: ext.h,v 1.7 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: ext.h,v 1.5 1997/10/17 11:19:48 ws Exp $	*/
 
 /*
@@ -58,12 +58,12 @@ extern struct dosDirEntry *rootDir;
 /*
  * function declarations
  */
-int ask __P((int, const char *, ...));
+int ask(int, const char *, ...);
 
 /*
  * Check filesystem given as arg
  */
-int checkfilesys __P((const char *));
+int checkfilesys(const char *);
 
 /*
  * Return values of various functions
@@ -79,41 +79,41 @@ int checkfilesys __P((const char *));
  * read a boot block in a machine independend fashion and translate
  * it into our struct bootblock.
  */
-int readboot __P((int, struct bootblock *));
+int readboot(int, struct bootblock *);
 
 /*
  * Correct the FSInfo block.
  */
-int writefsinfo __P((int, struct bootblock *));
+int writefsinfo(int, struct bootblock *);
 
 /*
  * Read one of the FAT copies and return a pointer to the new
  * allocated array holding our description of it.
  */
-int readfat __P((int, struct bootblock *, int, struct fatEntry **));
+int readfat(int, struct bootblock *, int, struct fatEntry **);
 
 /*
  * Check two FAT copies for consistency and merge changes into the
  * first if neccessary.
  */
-int comparefat __P((struct bootblock *, struct fatEntry *, struct fatEntry *, int));
+int comparefat(struct bootblock *, struct fatEntry *, struct fatEntry *, int);
 
 /*
  * Check a FAT
  */
-int checkfat __P((struct bootblock *, struct fatEntry *));
+int checkfat(struct bootblock *, struct fatEntry *);
 
 /*
  * Write back FAT entries
  */
-int writefat __P((int, struct bootblock *, struct fatEntry *));
+int writefat(int, struct bootblock *, struct fatEntry *);
 
 /*
  * Read a directory
  */
-int resetDosDirSection __P((struct bootblock *, struct fatEntry *));
-void finishDosDirSection __P((void));
-int handleDirTree __P((int, struct bootblock *, struct fatEntry *));
+int resetDosDirSection(struct bootblock *, struct fatEntry *);
+void finishDosDirSection(void);
+int handleDirTree(int, struct bootblock *, struct fatEntry *);
 
 /*
  * Cross-check routines run after everything is completely in memory
@@ -121,12 +121,12 @@ int handleDirTree __P((int, struct bootblock *, struct fatEntry *));
 /*
  * Check for lost cluster chains
  */
-int checklost __P((int, struct bootblock *, struct fatEntry *));
+int checklost(int, struct bootblock *, struct fatEntry *);
 /*
  * Try to reconnect a lost cluster chain
  */
-int reconnect __P((int, struct bootblock *, struct fatEntry *, cl_t));
-void finishlf __P((void));
+int reconnect(int, struct bootblock *, struct fatEntry *, cl_t);
+void finishlf(void);
 
 /*
  * Small helper functions
@@ -134,11 +134,11 @@ void finishlf __P((void));
 /*
  * Return the type of a reserved cluster as text
  */
-char *rsrvdcltype __P((cl_t));
+char *rsrvdcltype(cl_t);
 
 /*
  * Clear a cluster chain in a FAT
  */
-void clearchain __P((struct bootblock *, struct fatEntry *, cl_t));
+void clearchain(struct bootblock *, struct fatEntry *, cl_t);
 
 #endif
diff --git a/sbin/fsck_msdos/fat.c b/sbin/fsck_msdos/fat.c
index 9ed3137ad52..f46c3ca5121 100644
--- a/sbin/fsck_msdos/fat.c
+++ b/sbin/fsck_msdos/fat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fat.c,v 1.9 2000/06/28 17:42:06 mickey Exp $	*/
+/*	$OpenBSD: fat.c,v 1.10 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: fat.c,v 1.8 1997/10/17 11:19:53 ws Exp $	*/
 
 /*
@@ -35,7 +35,7 @@
 
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: fat.c,v 1.9 2000/06/28 17:42:06 mickey Exp $";
+static char rcsid[] = "$OpenBSD: fat.c,v 1.10 2002/02/16 21:27:34 millert Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
@@ -46,9 +46,9 @@ static char rcsid[] = "$OpenBSD: fat.c,v 1.9 2000/06/28 17:42:06 mickey Exp $";
 
 #include "ext.h"
 
-static int checkclnum __P((struct bootblock *, int, cl_t, cl_t *));
-static int clustdiffer __P((cl_t, cl_t *, cl_t *, int));
-static int tryclear __P((struct bootblock *, struct fatEntry *, cl_t, cl_t *));
+static int checkclnum(struct bootblock *, int, cl_t, cl_t *);
+static int clustdiffer(cl_t, cl_t *, cl_t *, int);
+static int tryclear(struct bootblock *, struct fatEntry *, cl_t, cl_t *);
 
 /*
  * Check a cluster number for valid value
diff --git a/sbin/fsck_msdos/main.c b/sbin/fsck_msdos/main.c
index aec6ae0acad..e623113d4d0 100644
--- a/sbin/fsck_msdos/main.c
+++ b/sbin/fsck_msdos/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.10 2001/09/05 22:32:37 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.11 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: main.c,v 1.8 1996/10/17 20:29:53 cgd Exp $	*/
 
 /*
@@ -35,7 +35,7 @@
 
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: main.c,v 1.10 2001/09/05 22:32:37 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.11 2002/02/16 21:27:34 millert Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
@@ -57,8 +57,8 @@ int alwaysyes;		/* assume "yes" for all questions */
 int preen;		/* set when preening */
 int rdonly;		/* device is opened read only (supersedes above) */
 
-static void usage __P((void));
-int main __P((int, char **));
+static void usage(void);
+int main(int, char **);
 
 static void
 usage()
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index d163b75e6bb..12d55d3f7eb 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsdb.c,v 1.8 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: fsdb.c,v 1.9 2002/02/16 21:27:34 millert Exp $	*/
 /*	$NetBSD: fsdb.c,v 1.7 1997/01/11 06:50:53 lukem Exp $	*/
 
 /*-
@@ -68,16 +68,16 @@ static char rcsid[] = "$NetBSD: fsdb.c,v 1.4 1996/03/21 17:56:15 jtc Exp $";
 
 extern char *__progname;	/* from crt0.o */
 
-int main __P((int, char *[]));
-static void usage __P((void));
-static int cmdloop __P((void));
-static int helpfn __P((int, char *[]));
-static char *prompt __P((EditLine *));
-static int scannames __P((struct inodesc *));
-static int dolookup __P((char *));
-static int chinumfunc __P((struct inodesc *));
-static int chnamefunc __P((struct inodesc *));
-static int dotime __P((char *, int32_t *, int32_t *));
+int main(int, char *[]);
+static void usage(void);
+static int cmdloop(void);
+static int helpfn(int, char *[]);
+static char *prompt(EditLine *);
+static int scannames(struct inodesc *);
+static int dolookup(char *);
+static int chinumfunc(struct inodesc *);
+static int chnamefunc(struct inodesc *);
+static int dotime(char *, int32_t *, int32_t *);
 
 int returntosingle = 0;
 struct dinode *curinode;
@@ -132,7 +132,7 @@ main(argc, argv)
 	exit(rval);
 }
 
-#define CMDFUNC(func) static int func __P((int argc, char *argv[]))
+#define CMDFUNC(func) static int func(int argc, char *argv[])
 #define CMDFUNCSTART(func) static int func(argc, argv)		\
 				int argc;		\
 				char *argv[];
diff --git a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h
index 63a2e2f0db7..cfed3d503ed 100644
--- a/sbin/fsdb/fsdb.h
+++ b/sbin/fsdb/fsdb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsdb.h,v 1.3 1997/01/16 04:04:20 millert Exp $	*/
+/*	$OpenBSD: fsdb.h,v 1.4 2002/02/16 21:27:35 millert Exp $	*/
 /*	$NetBSD: fsdb.h,v 1.4 1996/09/28 19:30:36 christos Exp $	*/
 
 /*-
@@ -37,10 +37,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-extern int bread __P((int fd, char *buf, daddr_t blk, long size));
-extern void bwrite __P((int fd, char *buf, daddr_t blk, long size));
-extern void rwerror __P((char *mesg, daddr_t blk));
-extern int reply __P((char *question));
+extern int bread(int fd, char *buf, daddr_t blk, long size);
+extern void bwrite(int fd, char *buf, daddr_t blk, long size);
+extern void rwerror(char *mesg, daddr_t blk);
+extern int reply(char *question);
 
 extern long dev_bsize;
 extern long secsize;
@@ -52,14 +52,14 @@ struct cmdtable {
 	const char *helptxt;
 	unsigned int minargc;
 	unsigned int maxargc;
-	int (*handler) __P((int argc, char *argv[]));
+	int (*handler)(int argc, char *argv[]);
 };
 extern struct dinode *curinode;
 extern ino_t curinum;
 
-char **crack __P((char *, int *));
-int argcount __P((struct cmdtable *, int, char *[]));
-void printstat __P((const char *, ino_t, struct dinode *));
-int checkactive __P((void));
-int checkactivedir __P((void));
-int printactive __P((void));
+char **crack(char *, int *);
+int argcount(struct cmdtable *, int, char *[]);
+void printstat(const char *, ino_t, struct dinode *);
+int checkactive(void);
+int checkactivedir(void);
+int printactive(void);
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index dbb67b431b6..a76defcc476 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsirand.c,v 1.13 1998/06/21 22:13:55 millert Exp $	*/
+/*	$OpenBSD: fsirand.c,v 1.14 2002/02/16 21:27:35 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -28,7 +28,7 @@
  */
 
 #ifndef lint                                                              
-static char rcsid[] = "$OpenBSD: fsirand.c,v 1.13 1998/06/21 22:13:55 millert Exp $";
+static char rcsid[] = "$OpenBSD: fsirand.c,v 1.14 2002/02/16 21:27:35 millert Exp $";
 #endif /* not lint */                                                        
 
 #include <sys/types.h>
@@ -50,8 +50,8 @@ static char rcsid[] = "$OpenBSD: fsirand.c,v 1.13 1998/06/21 22:13:55 millert Ex
 #include <unistd.h>
 #include <util.h>
 
-void usage __P((int));
-int fsirand __P((char *));
+void usage(int);
+int fsirand(char *);
 
 extern char *__progname;
 
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 4c72df2e55a..39f6d6f786c 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifconfig.c,v 1.55 2001/11/13 18:08:21 mickey Exp $	*/
+/*	$OpenBSD: ifconfig.c,v 1.56 2002/02/16 21:27:35 millert Exp $	*/
 /*	$NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $	*/
 
 /*
@@ -81,7 +81,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)ifconfig.c	8.2 (Berkeley) 2/16/94";
 #else
-static const char rcsid[] = "$OpenBSD: ifconfig.c,v 1.55 2001/11/13 18:08:21 mickey Exp $";
+static const char rcsid[] = "$OpenBSD: ifconfig.c,v 1.56 2002/02/16 21:27:35 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -159,43 +159,43 @@ int	explicit_prefix = 0;
 int	Lflag = 1;
 #endif
 
-void	notealias __P((char *, int));
-void	notrailers __P((char *, int));
-void	setifaddr __P((char *, int));
-void	setifdstaddr __P((char *, int));
-void	setifflags __P((char *, int));
-void	setifbroadaddr __P((char *));
-void	setifipdst __P((char *));
-void	setifmetric __P((char *));
-void	setifmtu __P((char *, int));
-void	setifnwid __P((char *, int));
-void	setifnetmask __P((char *));
-void	setifprefixlen __P((char *, int));
-void	setnsellength __P((char *));
-void	setsnpaoffset __P((char *));
-void	setipxframetype __P((char *, int));
-void    setatrange __P((char *, int));
-void    setatphase __P((char *, int));
-void    settunnel __P((char *, char *));
-void    deletetunnel __P((void));
+void	notealias(char *, int);
+void	notrailers(char *, int);
+void	setifaddr(char *, int);
+void	setifdstaddr(char *, int);
+void	setifflags(char *, int);
+void	setifbroadaddr(char *);
+void	setifipdst(char *);
+void	setifmetric(char *);
+void	setifmtu(char *, int);
+void	setifnwid(char *, int);
+void	setifnetmask(char *);
+void	setifprefixlen(char *, int);
+void	setnsellength(char *);
+void	setsnpaoffset(char *);
+void	setipxframetype(char *, int);
+void    setatrange(char *, int);
+void    setatphase(char *, int);
+void    settunnel(char *, char *);
+void    deletetunnel(void);
 #ifdef INET6
-void	setia6flags __P((char *, int));
-void	setia6pltime __P((char *, int));
-void	setia6vltime __P((char *, int));
-void	setia6lifetime __P((char *, char *));
+void	setia6flags(char *, int);
+void	setia6pltime(char *, int);
+void	setia6vltime(char *, int);
+void	setia6lifetime(char *, char *);
 #endif
-void    checkatrange __P ((struct sockaddr_at *));
-void	setmedia __P((char *, int));
-void	setmediaopt __P((char *, int));
-void	unsetmediaopt __P((char *, int));
-void	setmediainst __P((char *, int));
-void	setvlantag __P((char *, int));
-void	setvlandev __P((char *, int));
-void	unsetvlandev __P((char *, int));
+void    checkatrange(struct sockaddr_at *);
+void	setmedia(char *, int);
+void	setmediaopt(char *, int);
+void	unsetmediaopt(char *, int);
+void	setmediainst(char *, int);
+void	setvlantag(char *, int);
+void	setvlandev(char *, int);
+void	unsetvlandev(char *, int);
 void	vlan_status ();
-void	fixnsel __P((struct sockaddr_iso *));
-int	main __P((int, char *[]));
-int	prefix __P((void *val, int));
+void	fixnsel(struct sockaddr_iso *);
+int	main(int, char *[]);
+int	prefix(void *val, int);
 
 /*
  * Media stuff.  Whenever a media command is first performed, the
@@ -291,47 +291,47 @@ const struct	cmd {
 };
 
 void	adjust_nsellength();
-int	getinfo __P((struct ifreq *));
-void	getsock __P((int));
-void	printif __P((struct ifreq *, int));
-void	printb __P((char *, unsigned short, char *));
-void	status __P((int));
+int	getinfo(struct ifreq *);
+void	getsock(int);
+void	printif(struct ifreq *, int);
+void	printb(char *, unsigned short, char *);
+void	status(int);
 void	usage();
-char	*sec2str __P((time_t));
+char	*sec2str(time_t);
 
-const char *get_media_type_string __P((int));
-const char *get_media_subtype_string __P((int));
-int	get_media_subtype __P((int, const char *));
-int	get_media_options __P((int, const char *));
+const char *get_media_type_string(int);
+const char *get_media_subtype_string(int);
+int	get_media_subtype(int, const char *);
+int	get_media_options(int, const char *);
 int	lookup_media_word __P((const struct ifmedia_description *, int,
 	    const char *));
-void	print_media_word __P((int, int, int));
-void	process_media_commands __P((void));
-void	init_current_media __P((void));
+void	print_media_word(int, int, int);
+void	process_media_commands(void);
+void	init_current_media(void);
 
 /*
  * XNS support liberally adapted from code written at the University of
  * Maryland principally by James O'Toole and Chris Torek.
  */
-void	in_status __P((int));
-void	in_getaddr __P((char *, int));
-void	in_getprefix __P((char *, int));
+void	in_status(int);
+void	in_getaddr(char *, int);
+void	in_getprefix(char *, int);
 #ifdef INET6
-void	in6_fillscopeid __P((struct sockaddr_in6 *sin6));
-void	in6_alias __P((struct in6_ifreq *));
-void	in6_status __P((int));
-void	in6_getaddr __P((char *, int));
-void	in6_getprefix __P((char *, int));
+void	in6_fillscopeid(struct sockaddr_in6 *sin6);
+void	in6_alias(struct in6_ifreq *);
+void	in6_status(int);
+void	in6_getaddr(char *, int);
+void	in6_getprefix(char *, int);
 #endif
-void    at_status __P((int));
-void    at_getaddr __P((char *, int));
-void	xns_status __P((int));
-void	xns_getaddr __P((char *, int));
-void	ipx_status __P((int));
-void	ipx_getaddr __P((char *, int));
-void	iso_status __P((int));
-void	iso_getaddr __P((char *, int));
-void	ieee80211_status __P((void));
+void    at_status(int);
+void    at_getaddr(char *, int);
+void	xns_status(int);
+void	xns_getaddr(char *, int);
+void	ipx_status(int);
+void	ipx_getaddr(char *, int);
+void	iso_status(int);
+void	iso_getaddr(char *, int);
+void	ieee80211_status(void);
 
 /* Known address families */
 const struct afswtch {
diff --git a/sbin/init/init.c b/sbin/init/init.c
index 30a62c17039..9cabc9c0409 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init.c,v 1.23 2001/11/05 07:39:16 mpech Exp $	*/
+/*	$OpenBSD: init.c,v 1.24 2002/02/16 21:27:35 millert Exp $	*/
 /*	$NetBSD: init.c,v 1.22 1996/05/15 23:29:33 jtc Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)init.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: init.c,v 1.23 2001/11/05 07:39:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: init.c,v 1.24 2002/02/16 21:27:35 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -105,38 +105,38 @@ static char rcsid[] = "$OpenBSD: init.c,v 1.23 2001/11/05 07:39:16 mpech Exp $";
 #define DEFAULT_STATE		runcom
 #endif
 
-void handle __P((sig_t, ...));
-void delset __P((sigset_t *, ...));
+void handle(sig_t, ...);
+void delset(sigset_t *, ...);
 
-void stall __P((char *, ...));
-void warning __P((char *, ...));
-void emergency __P((char *, ...));
-void disaster __P((int));
-void badsys __P((int));
+void stall(char *, ...);
+void warning(char *, ...);
+void emergency(char *, ...);
+void disaster(int);
+void badsys(int);
 
 /*
  * We really need a recursive typedef...
  * The following at least guarantees that the return type of (*state_t)()
  * is sufficiently wide to hold a function pointer.
  */
-typedef long (*state_func_t) __P((void));
-typedef state_func_t (*state_t) __P((void));
-
-state_func_t single_user __P((void));
-state_func_t runcom __P((void));
-state_func_t read_ttys __P((void));
-state_func_t multi_user __P((void));
-state_func_t clean_ttys __P((void));
-state_func_t catatonia __P((void));
-state_func_t death __P((void));
-state_func_t nice_death __P((void));
+typedef long (*state_func_t)(void);
+typedef state_func_t (*state_t)(void);
+
+state_func_t single_user(void);
+state_func_t runcom(void);
+state_func_t read_ttys(void);
+state_func_t multi_user(void);
+state_func_t clean_ttys(void);
+state_func_t catatonia(void);
+state_func_t death(void);
+state_func_t nice_death(void);
 
 enum { AUTOBOOT, FASTBOOT } runcom_mode = AUTOBOOT;
 
-void transition __P((state_t));
+void transition(state_t);
 state_t requested_transition = DEFAULT_STATE;
 
-void setctty __P((char *));
+void setctty(char *);
 
 typedef struct init_session {
 	int	se_index;		/* index of entry in ttys file */
@@ -155,33 +155,33 @@ typedef struct init_session {
 	struct	init_session *se_next;
 } session_t;
 
-void free_session __P((session_t *));
-session_t *new_session __P((session_t *, int, struct ttyent *));
+void free_session(session_t *);
+session_t *new_session(session_t *, int, struct ttyent *);
 session_t *sessions;
 
-char **construct_argv __P((char *));
-void start_window_system __P((session_t *));
-void collect_child __P((pid_t));
-pid_t start_getty __P((session_t *));
-void transition_handler __P((int));
-void alrm_handler __P((int));
-void setsecuritylevel __P((int));
-int getsecuritylevel __P((void));
-int setupargv __P((session_t *, struct ttyent *));
+char **construct_argv(char *);
+void start_window_system(session_t *);
+void collect_child(pid_t);
+pid_t start_getty(session_t *);
+void transition_handler(int);
+void alrm_handler(int);
+void setsecuritylevel(int);
+int getsecuritylevel(void);
+int setupargv(session_t *, struct ttyent *);
 int clang;
 
 #ifdef LOGIN_CAP
-void setprocresources __P((char *));
+void setprocresources(char *);
 #else
 #define setprocresources(p)
 #endif
 
-void clear_session_logs __P((session_t *));
+void clear_session_logs(session_t *);
 
-int start_session_db __P((void));
-void add_session __P((session_t *));
-void del_session __P((session_t *));
-session_t *find_session __P((pid_t));
+int start_session_db(void);
+void add_session(session_t *);
+void del_session(session_t *);
+session_t *find_session(pid_t);
 DB *session_db;
 
 /*
diff --git a/sbin/isakmpd/sysdep/common/blf.h b/sbin/isakmpd/sysdep/common/blf.h
index 042668138bc..6c5cd97a37c 100644
--- a/sbin/isakmpd/sysdep/common/blf.h
+++ b/sbin/isakmpd/sysdep/common/blf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: blf.h,v 1.1 2001/01/26 11:33:59 niklas Exp $ */
+/* $OpenBSD: blf.h,v 1.2 2002/02/16 21:27:35 millert Exp $ */
 /*
  * Blowfish - a fast block cipher designed by Bruce Schneier
  *
@@ -60,20 +60,20 @@ typedef struct BlowfishContext {
  *	Blowfish_expand0state( state, key, keylen )
  */
 
-void Blowfish_encipher __P((blf_ctx *, u_int32_t *, u_int32_t *));
-void Blowfish_decipher __P((blf_ctx *, u_int32_t *, u_int32_t *));
-void Blowfish_initstate __P((blf_ctx *));
-void Blowfish_expand0state __P((blf_ctx *, const u_int8_t *, u_int16_t));
+void Blowfish_encipher(blf_ctx *, u_int32_t *, u_int32_t *);
+void Blowfish_decipher(blf_ctx *, u_int32_t *, u_int32_t *);
+void Blowfish_initstate(blf_ctx *);
+void Blowfish_expand0state(blf_ctx *, const u_int8_t *, u_int16_t);
 void Blowfish_expandstate
-    __P((blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t));
+(blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t);
 
 /* Standard Blowfish */
 
-void blf_key __P((blf_ctx *, const u_int8_t *, u_int16_t));
-void blf_enc __P((blf_ctx *, u_int32_t *, u_int16_t));
-void blf_dec __P((blf_ctx *, u_int32_t *, u_int16_t));
+void blf_key(blf_ctx *, const u_int8_t *, u_int16_t);
+void blf_enc(blf_ctx *, u_int32_t *, u_int16_t);
+void blf_dec(blf_ctx *, u_int32_t *, u_int16_t);
 
 /* Converts u_int8_t to u_int32_t */
-u_int32_t Blowfish_stream2word __P((const u_int8_t *, u_int16_t , u_int16_t *));
+u_int32_t Blowfish_stream2word(const u_int8_t *, u_int16_t , u_int16_t *);
 
 #endif
diff --git a/sbin/isakmpd/sysdep/linux/sysdep-os.h b/sbin/isakmpd/sysdep/linux/sysdep-os.h
index 74e051c4f33..bdf9e25a979 100644
--- a/sbin/isakmpd/sysdep/linux/sysdep-os.h
+++ b/sbin/isakmpd/sysdep/linux/sysdep-os.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysdep-os.h,v 1.4 2001/01/28 22:38:49 niklas Exp $	*/
+/*	$OpenBSD: sysdep-os.h,v 1.5 2002/02/16 21:27:35 millert Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
@@ -43,7 +43,7 @@ typedef u_int32_t in_addr_t;
 /*
  * Why -D__USE_GNU does not work in order to get this from stdio.h beats me.
  */
-extern int asprintf __P((char **, const char *, ...));
+extern int asprintf(char **, const char *, ...);
 #endif
 
 #define DL_LAZY RTLD_LAZY
diff --git a/sbin/kbd/main.c b/sbin/kbd/main.c
index b159d7b3e95..85a0f946fcf 100644
--- a/sbin/kbd/main.c
+++ b/sbin/kbd/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.3 1997/09/14 10:37:58 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.4 2002/02/16 21:27:35 millert Exp $	*/
 
 /*
  * Copyright (c) 1996 Juergen Hannken-Illjes
@@ -35,8 +35,8 @@
 #include <unistd.h>
 #include <stdio.h>
 
-extern void kbd_list __P((void));
-extern void kbd_set __P((char *, int));
+extern void kbd_list(void);
+extern void kbd_set(char *, int);
 
 extern char *__progname;
 
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index 58a1da1127f..d4da3e0e8fa 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mknod.c,v 1.9 2001/07/07 18:26:14 deraadt Exp $	*/
+/*	$OpenBSD: mknod.c,v 1.10 2002/02/16 21:27:35 millert Exp $	*/
 /*	$NetBSD: mknod.c,v 1.8 1995/08/11 00:08:18 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mknod.c	8.1 (Berkeley) 6/5/93";
 #else
-static char rcsid[] = "$OpenBSD: mknod.c,v 1.9 2001/07/07 18:26:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mknod.c,v 1.10 2002/02/16 21:27:35 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -62,9 +62,9 @@ static char rcsid[] = "$OpenBSD: mknod.c,v 1.9 2001/07/07 18:26:14 deraadt Exp $
 
 extern char *__progname;
 
-int domknod __P((int, char **, mode_t));
-int domkfifo __P((int, char **, mode_t));
-void usage __P((int));
+int domknod(int, char **, mode_t);
+int domkfifo(int, char **, mode_t);
+void usage(int);
 
 int
 main(argc, argv)
diff --git a/sbin/modload/modload.c b/sbin/modload/modload.c
index abce30d4959..0fb8c972aa7 100644
--- a/sbin/modload/modload.c
+++ b/sbin/modload/modload.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: modload.c,v 1.32 2002/01/09 00:02:52 ericj Exp $	*/
+/* 	$OpenBSD: modload.c,v 1.33 2002/02/16 21:27:35 millert Exp $	*/
 /*	$NetBSD: modload.c,v 1.30 2001/11/08 15:33:15 christos Exp $	*/
 
 /*
@@ -67,7 +67,7 @@ char *out = NULL;
 int symtab = 1;
 int Sflag;
 
-static	void	cleanup __P((void));
+static	void	cleanup(void);
 
 /* prelink the module */
 static int
diff --git a/sbin/modload/modload.h b/sbin/modload/modload.h
index 80ba2f315be..2cb62243b73 100644
--- a/sbin/modload/modload.h
+++ b/sbin/modload/modload.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: modload.h,v 1.1 2002/01/08 21:28:38 ericj Exp $	*/
+/*	$OpenBSD: modload.h,v 1.2 2002/02/16 21:27:35 millert Exp $	*/
 /*	$NetBSD: modload.h,v 1.2 2001/11/08 15:33:15 christos Exp $	*/
 
 /*
@@ -38,17 +38,17 @@
 
 int	elf_mod_sizes	__P((int, size_t *, int *, struct lmc_resrv *,
 			     struct stat *));
-void	*elf_mod_load	__P((int));
+void	*elf_mod_load(int);
 void	elf_linkcmd	__P((char*, size_t, const char*, const char*, 
 			     const char*, const void*, const char*));
-void	elf_mod_symload	__P((int));
+void	elf_mod_symload(int);
 
 int	a_out_mod_sizes __P((int, size_t *, int *, struct lmc_resrv *,
 			     struct stat *));
-void	*a_out_mod_load	__P((int));
+void	*a_out_mod_load(int);
 void	a_out_linkcmd	__P((char*, size_t, const char*, const char*, 
 			     const char*, const void*, const char*));
-void	a_out_mod_symload __P((int));
+void	a_out_mod_symload(int);
 
 #ifndef USE_AOUT
 #define mod_sizes elf_mod_sizes
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 890fde93e0a..eebb6115df1 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mntopts.h,v 1.7 2001/04/04 20:19:00 gluk Exp $	*/
+/*	$OpenBSD: mntopts.h,v 1.8 2002/02/16 21:27:35 millert Exp $	*/
 /*	$NetBSD: mntopts.h,v 1.3 1995/03/18 14:56:59 cgd Exp $	*/
 
 /*-
@@ -86,4 +86,4 @@ struct mntopt {
 	MOPT_RDONLY,							\
 	MOPT_UNION
 
-void getmntopts __P((const char *, const struct mntopt *, int *));
+void getmntopts(const char *, const struct mntopt *, int *);
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index dc543569320..36f9bc80214 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount.c,v 1.24 2002/01/18 01:37:27 mickey Exp $	*/
+/*	$OpenBSD: mount.c,v 1.25 2002/02/16 21:27:35 millert Exp $	*/
 /*	$NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount.c	8.19 (Berkeley) 4/19/94";
 #else
-static char rcsid[] = "$OpenBSD: mount.c,v 1.24 2002/01/18 01:37:27 mickey Exp $";
+static char rcsid[] = "$OpenBSD: mount.c,v 1.25 2002/02/16 21:27:35 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -75,18 +75,18 @@ static char rcsid[] = "$OpenBSD: mount.c,v 1.24 2002/01/18 01:37:27 mickey Exp $
 int	debug, verbose;
 char	**typelist = NULL;
 
-int	selected __P((const char *));
-char   *catopt __P((char *, const char *));
+int	selected(const char *);
+char   *catopt(char *, const char *);
 struct statfs
-       *getmntpt __P((const char *));
-int	hasopt __P((const char *, const char *));
-void	maketypelist __P((char *));
-void	mangle __P((char *, int *, const char **));
+       *getmntpt(const char *);
+int	hasopt(const char *, const char *);
+void	maketypelist(char *);
+void	mangle(char *, int *, const char **);
 int	mountfs __P((const char *, const char *, const char *,
 			int, const char *, const char *, int));
-void	prmount __P((struct statfs *));
-int	disklabelcheck __P((struct fstab *));
-void	usage __P((void));
+void	prmount(struct statfs *);
+int	disklabelcheck(struct fstab *);
+void	usage(void);
 
 /* Map from mount options to printable formats. */
 static struct opt {
diff --git a/sbin/mount_ados/mount_ados.c b/sbin/mount_ados/mount_ados.c
index 46feeae01b6..61ebe19cbf1 100644
--- a/sbin/mount_ados/mount_ados.c
+++ b/sbin/mount_ados/mount_ados.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_ados.c,v 1.7 1997/08/24 08:07:05 downsj Exp $	*/
+/*	$OpenBSD: mount_ados.c,v 1.8 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: mount_ados.c,v 1.5 1996/04/13 01:30:59 jtc Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: mount_ados.c,v 1.7 1997/08/24 08:07:05 downsj Exp $";
+static char rcsid[] = "$OpenBSD: mount_ados.c,v 1.8 2002/02/16 21:27:36 millert Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
@@ -56,10 +56,10 @@ const struct mntopt mopts[] = {
 	{ NULL }
 };
 
-gid_t	a_gid __P((char *));
-uid_t	a_uid __P((char *));
-mode_t	a_mask __P((char *));
-void	usage __P((void));
+gid_t	a_gid(char *);
+uid_t	a_uid(char *);
+mode_t	a_mask(char *);
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 517b11cd2f2..4a35f1f5b74 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_cd9660.c,v 1.11 2000/07/31 01:57:06 pjanzen Exp $	*/
+/*	$OpenBSD: mount_cd9660.c,v 1.12 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: mount_cd9660.c,v 1.3 1996/04/13 01:31:08 jtc Exp $	*/
 
 /*
@@ -49,7 +49,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_cd9660.c	8.4 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.11 2000/07/31 01:57:06 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.12 2002/02/16 21:27:36 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -72,7 +72,7 @@ const struct mntopt mopts[] = {
 	{ NULL }
 };
 
-void	usage __P((void));
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index 41c6a133853..a7bdf9cc990 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_ext2fs.c,v 1.7 2000/01/22 20:25:00 deraadt Exp $	*/
+/*	$OpenBSD: mount_ext2fs.c,v 1.8 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: mount_ffs.c,v 1.3 1996/04/13 01:31:19 jtc Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_ufs.c	8.2 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_ext2fs.c,v 1.7 2000/01/22 20:25:00 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mount_ext2fs.c,v 1.8 2002/02/16 21:27:36 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -60,7 +60,7 @@ static char rcsid[] = "$OpenBSD: mount_ext2fs.c,v 1.7 2000/01/22 20:25:00 deraad
 
 #include "mntopts.h"
 
-void	ext2fs_usage __P((void));
+void	ext2fs_usage(void);
 
 static const struct mntopt mopts[] = {
 	MOPT_STDOPTS,
diff --git a/sbin/mount_fdesc/mount_fdesc.c b/sbin/mount_fdesc/mount_fdesc.c
index be6b4aece8d..44c1b8b2c15 100644
--- a/sbin/mount_fdesc/mount_fdesc.c
+++ b/sbin/mount_fdesc/mount_fdesc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_fdesc.c,v 1.6 1997/08/24 08:07:11 downsj Exp $	*/
+/*	$OpenBSD: mount_fdesc.c,v 1.7 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: mount_fdesc.c,v 1.7 1996/04/13 01:31:15 jtc Exp $	*/
 
 /*
@@ -48,7 +48,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_fdesc.c	8.2 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_fdesc.c,v 1.6 1997/08/24 08:07:11 downsj Exp $";
+static char rcsid[] = "$OpenBSD: mount_fdesc.c,v 1.7 2002/02/16 21:27:36 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -69,7 +69,7 @@ const struct mntopt mopts[] = {
 	{ NULL }
 };
 
-void	usage __P((void));
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/mount_ffs/mount_ffs.c b/sbin/mount_ffs/mount_ffs.c
index 7e4d88dd532..29e2f343467 100644
--- a/sbin/mount_ffs/mount_ffs.c
+++ b/sbin/mount_ffs/mount_ffs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_ffs.c,v 1.11 2001/04/04 20:19:01 gluk Exp $	*/
+/*	$OpenBSD: mount_ffs.c,v 1.12 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: mount_ffs.c,v 1.3 1996/04/13 01:31:19 jtc Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_ufs.c	8.2 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_ffs.c,v 1.11 2001/04/04 20:19:01 gluk Exp $";
+static char rcsid[] = "$OpenBSD: mount_ffs.c,v 1.12 2002/02/16 21:27:36 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -60,7 +60,7 @@ static char rcsid[] = "$OpenBSD: mount_ffs.c,v 1.11 2001/04/04 20:19:01 gluk Exp
 
 #include "mntopts.h"
 
-void	ffs_usage __P((void));
+void	ffs_usage(void);
 
 static const struct mntopt mopts[] = {
 	MOPT_STDOPTS,
diff --git a/sbin/mount_kernfs/mount_kernfs.c b/sbin/mount_kernfs/mount_kernfs.c
index 3ef864409f6..24e785cd8ac 100644
--- a/sbin/mount_kernfs/mount_kernfs.c
+++ b/sbin/mount_kernfs/mount_kernfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_kernfs.c,v 1.7 1998/12/21 16:14:40 mickey Exp $	*/
+/*	$OpenBSD: mount_kernfs.c,v 1.8 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: mount_kernfs.c,v 1.8 1996/04/13 05:35:39 cgd Exp $	*/
 
 /*
@@ -48,7 +48,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_kernfs.c	8.2 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_kernfs.c,v 1.7 1998/12/21 16:14:40 mickey Exp $";
+static char rcsid[] = "$OpenBSD: mount_kernfs.c,v 1.8 2002/02/16 21:27:36 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -69,7 +69,7 @@ const struct mntopt mopts[] = {
 	{ NULL }
 };
 
-void	usage __P((void));
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/mount_lfs/mount_lfs.c b/sbin/mount_lfs/mount_lfs.c
index 3e4c35ef43b..eb1bec192c5 100644
--- a/sbin/mount_lfs/mount_lfs.c
+++ b/sbin/mount_lfs/mount_lfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_lfs.c,v 1.5 1997/01/15 23:41:22 millert Exp $	*/
+/*	$OpenBSD: mount_lfs.c,v 1.6 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: mount_lfs.c,v 1.4 1996/04/13 05:35:44 cgd Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_lfs.c	8.3 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_lfs.c,v 1.5 1997/01/15 23:41:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_lfs.c,v 1.6 2002/02/16 21:27:36 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -68,8 +68,8 @@ const struct mntopt mopts[] = {
 	{ NULL }
 };
 
-void	usage __P((void));
-void	invoke_cleaner __P((char *));
+void	usage(void);
+void	invoke_cleaner(char *);
 
 int short_rds, cleaner_debug;
 
diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c
index 5eade9a29d2..5f642b02c7e 100644
--- a/sbin/mount_msdos/mount_msdos.c
+++ b/sbin/mount_msdos/mount_msdos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_msdos.c,v 1.12 1999/04/20 23:06:47 millert Exp $	*/
+/*	$OpenBSD: mount_msdos.c,v 1.13 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: mount_msdos.c,v 1.16 1996/10/24 00:12:50 cgd Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: mount_msdos.c,v 1.12 1999/04/20 23:06:47 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_msdos.c,v 1.13 2002/02/16 21:27:36 millert Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
@@ -57,10 +57,10 @@ const struct mntopt mopts[] = {
 	{ NULL }
 };
 
-gid_t	a_gid __P((char *));
-uid_t	a_uid __P((char *));
-mode_t	a_mask __P((char *));
-void	usage __P((void));
+gid_t	a_gid(char *);
+uid_t	a_uid(char *);
+mode_t	a_mask(char *);
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/mount_nfs/mntopts.h b/sbin/mount_nfs/mntopts.h
index 8b98770c42a..2e85b063150 100644
--- a/sbin/mount_nfs/mntopts.h
+++ b/sbin/mount_nfs/mntopts.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mntopts.h,v 1.1 1996/03/21 00:16:00 niklas Exp $	*/
+/*	$OpenBSD: mntopts.h,v 1.2 2002/02/16 21:27:36 millert Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -78,5 +78,5 @@ struct mntopt {
 	MOPT_RDONLY,							\
 	MOPT_UNION
 
-void getmntopts __P((const char *, const struct mntopt *, int *, int *));
+void getmntopts(const char *, const struct mntopt *, int *, int *);
 extern int getmnt_silent;
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index eb044a04a33..b0a79acb195 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_nfs.c,v 1.26 2001/12/01 19:13:48 deraadt Exp $	*/
+/*	$OpenBSD: mount_nfs.c,v 1.27 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: mount_nfs.c,v 1.12.4.1 1996/05/25 22:48:05 fvdl Exp $	*/
 
 /*
@@ -168,14 +168,14 @@ u_short port_no = 0;
 int force2 = 0;
 int force3 = 0;
 
-int	getnfsargs __P((char *, struct nfs_args *));
+int	getnfsargs(char *, struct nfs_args *);
 #ifdef ISO
-struct	iso_addr *iso_addr __P((const char *));
+struct	iso_addr *iso_addr(const char *);
 #endif
-void	set_rpc_maxgrouplist __P((int));
-__dead	void usage __P((void));
-int	xdr_dir __P((XDR *, char *));
-int	xdr_fh __P((XDR *, struct nfhret *));
+void	set_rpc_maxgrouplist(int);
+__dead	void usage(void);
+int	xdr_dir(XDR *, char *);
+int	xdr_fh(XDR *, struct nfhret *);
 
 int
 main(argc, argv)
diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c
index 4e01fc03154..308fc09e7b9 100644
--- a/sbin/mount_null/mount_null.c
+++ b/sbin/mount_null/mount_null.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_null.c,v 1.6 1997/08/24 08:07:14 downsj Exp $	*/
+/*	$OpenBSD: mount_null.c,v 1.7 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: mount_null.c,v 1.3 1996/04/13 01:31:49 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_null.c	8.5 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_null.c,v 1.6 1997/08/24 08:07:14 downsj Exp $";
+static char rcsid[] = "$OpenBSD: mount_null.c,v 1.7 2002/02/16 21:27:36 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -69,8 +69,8 @@ const struct mntopt mopts[] = {
 	{ NULL }
 };
 
-int	subdir __P((const char *, const char *));
-void	usage __P((void));
+int	subdir(const char *, const char *);
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c
index ae095ca118b..f996fe81cbb 100644
--- a/sbin/mount_portal/mount_portal.c
+++ b/sbin/mount_portal/mount_portal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_portal.c,v 1.17 2001/12/08 23:42:57 miod Exp $	*/
+/*	$OpenBSD: mount_portal.c,v 1.18 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: mount_portal.c,v 1.8 1996/04/13 01:31:54 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_portal.c	8.6 (Berkeley) 4/26/95";
 #else
-static char rcsid[] = "$OpenBSD: mount_portal.c,v 1.17 2001/12/08 23:42:57 miod Exp $";
+static char rcsid[] = "$OpenBSD: mount_portal.c,v 1.18 2002/02/16 21:27:36 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -79,7 +79,7 @@ extern char *__progname;	/* from crt0.o */
 
 static char *mountpt;		/* made available to signal handler */
 
-static void usage __P((void));
+static void usage(void);
 
 static volatile sig_atomic_t readcf;	/* Set when SIGHUP received */
 
diff --git a/sbin/mount_portal/portald.h b/sbin/mount_portal/portald.h
index 273fdb8f3a4..e9003655d8e 100644
--- a/sbin/mount_portal/portald.h
+++ b/sbin/mount_portal/portald.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: portald.h,v 1.3 1997/03/23 03:52:15 millert Exp $	*/
+/*	$OpenBSD: portald.h,v 1.4 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: portald.h,v 1.4 1995/04/23 10:33:23 cgd Exp $	*/
 
 /*
@@ -79,6 +79,6 @@ extern int portal_tcp __P((struct portal_cred *,
 /*
  * Global functions
  */
-extern void activate __P((qelem *q, int so));
-extern char **conf_match __P((qelem *q, char *key));
-extern void conf_read __P((qelem *q, char *conf));
+extern void activate(qelem *q, int so);
+extern char **conf_match(qelem *q, char *key);
+extern void conf_read(qelem *q, char *conf);
diff --git a/sbin/mount_procfs/mount_procfs.c b/sbin/mount_procfs/mount_procfs.c
index dce84a64bbc..ec0f7252df6 100644
--- a/sbin/mount_procfs/mount_procfs.c
+++ b/sbin/mount_procfs/mount_procfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_procfs.c,v 1.7 2001/04/09 07:14:20 tholo Exp $	*/
+/*	$OpenBSD: mount_procfs.c,v 1.8 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: mount_procfs.c,v 1.7 1996/04/13 01:31:59 jtc Exp $	*/
 
 /*
@@ -48,7 +48,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_procfs.c	8.3 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_procfs.c,v 1.7 2001/04/09 07:14:20 tholo Exp $";
+static char rcsid[] = "$OpenBSD: mount_procfs.c,v 1.8 2002/02/16 21:27:36 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -72,7 +72,7 @@ const struct mntopt mopts[] = {
 	{ NULL }
 };
 
-void	usage __P((void));
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/mount_tcfs/mount_tcfs.c b/sbin/mount_tcfs/mount_tcfs.c
index 370519d48ef..de3df97ad60 100644
--- a/sbin/mount_tcfs/mount_tcfs.c
+++ b/sbin/mount_tcfs/mount_tcfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_tcfs.c,v 1.4 2000/06/21 05:28:25 fgsch Exp $	*/
+/*	$OpenBSD: mount_tcfs.c,v 1.5 2002/02/16 21:27:36 millert Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994
@@ -59,8 +59,8 @@ const struct mntopt mopts[] = {
 	{ NULL }
 };
 
-int	subdir __P((const char *, const char *));
-void	tcfs_usage __P((void));
+int	subdir(const char *, const char *);
+void	tcfs_usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c
index 3112292a646..6b68b63a801 100644
--- a/sbin/mount_umap/mount_umap.c
+++ b/sbin/mount_umap/mount_umap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_umap.c,v 1.8 2001/01/31 22:32:30 deraadt Exp $	*/
+/*	$OpenBSD: mount_umap.c,v 1.9 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: mount_umap.c,v 1.5 1996/04/13 01:32:05 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_umap.c	8.3 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_umap.c,v 1.8 2001/01/31 22:32:30 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mount_umap.c,v 1.9 2002/02/16 21:27:36 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -89,7 +89,7 @@ const struct mntopt mopts[] = {
 	{ NULL }
 };
 
-void	usage __P((void));
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/mount_union/mount_union.c b/sbin/mount_union/mount_union.c
index f9a4a2a7429..93cc15f2551 100644
--- a/sbin/mount_union/mount_union.c
+++ b/sbin/mount_union/mount_union.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_union.c,v 1.6 1997/08/24 06:52:01 deraadt Exp $	*/
+/*	$OpenBSD: mount_union.c,v 1.7 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: mount_union.c,v 1.3 1996/04/13 01:32:11 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_union.c	8.5 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_union.c,v 1.6 1997/08/24 06:52:01 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mount_union.c,v 1.7 2002/02/16 21:27:36 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -70,8 +70,8 @@ const struct mntopt mopts[] = {
 	{ NULL }
 };
 
-int	subdir __P((const char *, const char *));
-void	usage __P((void));
+int	subdir(const char *, const char *);
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index d38e4f3244c..249f2677c64 100644
--- a/sbin/mountd/mountd.c
+++ b/sbin/mountd/mountd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mountd.c,v 1.41 2001/12/02 02:05:59 deraadt Exp $	*/
+/*	$OpenBSD: mountd.c,v 1.42 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: mountd.c,v 1.31 1996/02/18 11:57:53 fvdl Exp $	*/
 
 /*
@@ -149,50 +149,50 @@ struct fhreturn {
 };
 
 /* Global defs */
-char	*add_expdir __P((struct dirlist **, char *, int));
+char	*add_expdir(struct dirlist **, char *, int);
 void	add_dlist __P((struct dirlist **, struct dirlist *,
 	    struct grouplist *, int));
-void	add_mlist __P((char *, char *));
-int	check_dirpath __P((char *));
-int	check_options __P((struct dirlist *));
-int	chk_host __P((struct dirlist *, in_addr_t, int *, int *));
-void	del_mlist __P((char *, char *));
-struct dirlist *dirp_search __P((struct dirlist *, char *));
+void	add_mlist(char *, char *);
+int	check_dirpath(char *);
+int	check_options(struct dirlist *);
+int	chk_host(struct dirlist *, in_addr_t, int *, int *);
+void	del_mlist(char *, char *);
+struct dirlist *dirp_search(struct dirlist *, char *);
 int	do_mount __P((struct exportlist *, struct grouplist *, int,
 	    struct ucred *, char *, int, struct statfs *));
 int	do_opt __P((char **, char **, struct exportlist *, struct grouplist *,
 	    int *, int *, struct ucred *));
-struct	exportlist *ex_search __P((fsid_t *));
-struct	exportlist *get_exp __P((void));
-void	free_dir __P((struct dirlist *));
-void	free_exp __P((struct exportlist *));
-void	free_grp __P((struct grouplist *));
-void	free_host __P((struct hostlist *));
-void	new_exportlist __P((void));
-void	get_exportlist __P((void));
-int	get_host __P((char *, struct grouplist *, struct grouplist *));
-int	get_num __P((char *));
-struct hostlist *get_ht __P((void));
-int	get_line __P((void));
-void	get_mountlist __P((void));
-int	get_net __P((char *, struct netmsk *, int));
-void	getexp_err __P((struct exportlist *, struct grouplist *));
-struct grouplist *get_grp __P((void));
+struct	exportlist *ex_search(fsid_t *);
+struct	exportlist *get_exp(void);
+void	free_dir(struct dirlist *);
+void	free_exp(struct exportlist *);
+void	free_grp(struct grouplist *);
+void	free_host(struct hostlist *);
+void	new_exportlist(void);
+void	get_exportlist(void);
+int	get_host(char *, struct grouplist *, struct grouplist *);
+int	get_num(char *);
+struct hostlist *get_ht(void);
+int	get_line(void);
+void	get_mountlist(void);
+int	get_net(char *, struct netmsk *, int);
+void	getexp_err(struct exportlist *, struct grouplist *);
+struct grouplist *get_grp(void);
 void	hang_dirp __P((struct dirlist *, struct grouplist *,
 	    struct exportlist *, int));
-void	mntsrv __P((struct svc_req *, SVCXPRT *));
-void	nextfield __P((char **, char **));
-void	out_of_mem __P((void));
-void	parsecred __P((char *, struct ucred *));
-int	put_exlist __P((struct dirlist *, XDR *, struct dirlist *, int *));
-int	scan_tree __P((struct dirlist *, in_addr_t));
-void	send_umntall __P((void));
-int	umntall_each __P((caddr_t, struct sockaddr_in *));
-int	xdr_dir __P((XDR *, char *));
-int	xdr_explist __P((XDR *, caddr_t));
-int	xdr_fhs __P((XDR *, caddr_t));
-int	xdr_mlist __P((XDR *, caddr_t));
-void	mountd_svc_run __P((void));
+void	mntsrv(struct svc_req *, SVCXPRT *);
+void	nextfield(char **, char **);
+void	out_of_mem(void);
+void	parsecred(char *, struct ucred *);
+int	put_exlist(struct dirlist *, XDR *, struct dirlist *, int *);
+int	scan_tree(struct dirlist *, in_addr_t);
+void	send_umntall(void);
+int	umntall_each(caddr_t, struct sockaddr_in *);
+int	xdr_dir(XDR *, char *);
+int	xdr_explist(XDR *, caddr_t);
+int	xdr_fhs(XDR *, caddr_t);
+int	xdr_mlist(XDR *, caddr_t);
+void	mountd_svc_run(void);
 
 struct exportlist *exphead;
 struct mountlist *mlhead;
@@ -289,8 +289,8 @@ main(argc, argv)
 	fprintf(pidfile, "%d\n", getpid());
 	fclose(pidfile);
 
-	signal(SIGHUP, (void (*) __P((int))) new_exportlist);
-	signal(SIGTERM, (void (*) __P((int))) send_umntall);
+	signal(SIGHUP, (void (*)(int)) new_exportlist);
+	signal(SIGTERM, (void (*)(int)) send_umntall);
 	signal(SIGSYS, SIG_IGN);
 	if ((udptransp = svcudp_create(RPC_ANYSOCK)) == NULL ||
 	    (tcptransp = svctcp_create(RPC_ANYSOCK, 0, 0)) == NULL) {
diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c
index 07fc32194ca..3d1bf1fef86 100644
--- a/sbin/ncheck_ffs/ncheck_ffs.c
+++ b/sbin/ncheck_ffs/ncheck_ffs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncheck_ffs.c,v 1.8 2001/12/01 19:05:39 deraadt Exp $	*/
+/*	$OpenBSD: ncheck_ffs.c,v 1.9 2002/02/16 21:27:36 millert Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
@@ -31,7 +31,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.8 2001/12/01 19:05:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.9 2002/02/16 21:27:36 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -72,20 +72,20 @@ struct icache_s {
 } *icache;
 int	nicache;
 
-void addinode __P((ino_t inum));
-struct dinode *getino __P((ino_t inum));
-void findinodes __P((ino_t));
-void bread __P((daddr_t, char *, int));
-void usage __P((void));
-void scanonedir __P((ino_t, const char *));
-void dirindir __P((ino_t, daddr_t, int, long *, const char *));
-void searchdir __P((ino_t, daddr_t, long, long, const char *));
-int matchino __P((const void *, const void *));
-int matchcache __P((const void *, const void *));
-void cacheino __P((ino_t, struct dinode *));
-struct dinode *cached __P((ino_t));
-int main __P((int, char *[]));
-char *rawname __P((char *));
+void addinode(ino_t inum);
+struct dinode *getino(ino_t inum);
+void findinodes(ino_t);
+void bread(daddr_t, char *, int);
+void usage(void);
+void scanonedir(ino_t, const char *);
+void dirindir(ino_t, daddr_t, int, long *, const char *);
+void searchdir(ino_t, daddr_t, long, long, const char *);
+int matchino(const void *, const void *);
+int matchcache(const void *, const void *);
+void cacheino(ino_t, struct dinode *);
+struct dinode *cached(ino_t);
+int main(int, char *[]);
+char *rawname(char *);
 
 /*
  * Check to see if the indicated inodes are the same
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 0698875c461..a7a00760424 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: newfs.c,v 1.29 2001/11/05 07:39:17 mpech Exp $	*/
+/*	$OpenBSD: newfs.c,v 1.30 2002/02/16 21:27:36 millert Exp $	*/
 /*	$NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)newfs.c	8.8 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: newfs.c,v 1.29 2001/11/05 07:39:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: newfs.c,v 1.30 2002/02/16 21:27:36 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -89,11 +89,11 @@ struct mntopt mopts[] = {
 	{ NULL },
 };
 
-void	fatal __P((const char *fmt, ...));
-void	usage __P((void));
-void	mkfs __P((struct partition *, char *, int, int));
-void	rewritelabel __P((char *, int, struct disklabel *));
-u_short	dkcksum __P((struct disklabel *));
+void	fatal(const char *fmt, ...);
+void	usage(void);
+void	mkfs(struct partition *, char *, int, int);
+void	rewritelabel(char *, int, struct disklabel *);
+u_short	dkcksum(struct disklabel *);
 
 #define	COMPAT			/* allow non-labeled disks */
 
diff --git a/sbin/newlfs/extern.h b/sbin/newlfs/extern.h
index 65ec0cbc77f..b0f100b080b 100644
--- a/sbin/newlfs/extern.h
+++ b/sbin/newlfs/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.3 1996/07/01 11:02:54 downsj Exp $	*/
+/*	$OpenBSD: extern.h,v 1.4 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.2 1995/03/18 14:58:48 cgd Exp $	*/
 
 /*-
@@ -36,13 +36,13 @@
  *	@(#)extern.h	8.2 (Berkeley) 5/24/95
  */
 
-u_long	cksum __P((void *, size_t));
-u_short	dkcksum __P((struct disklabel *));
-void	fatal __P((const char *fmt, ...));
-u_int	log2 __P((u_int));
+u_long	cksum(void *, size_t);
+u_short	dkcksum(struct disklabel *);
+void	fatal(const char *fmt, ...);
+u_int	log2(u_int);
 int	make_lfs __P((int, struct disklabel *, struct partition *, int,
 		int, int, int));
-int	mkfs __P((struct partition *, char *, int, int));
+int	mkfs(struct partition *, char *, int, int);
 
 extern char	*progname;
 extern char	*special;
diff --git a/sbin/newlfs/lfs.c b/sbin/newlfs/lfs.c
index 7220287491c..42c7f9abd40 100644
--- a/sbin/newlfs/lfs.c
+++ b/sbin/newlfs/lfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lfs.c,v 1.4 2001/11/05 07:39:17 mpech Exp $	*/
+/*	$OpenBSD: lfs.c,v 1.5 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: lfs.c,v 1.8 1995/06/19 21:30:36 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)lfs.c	8.5 (Berkeley) 5/24/95";
 #else
-static char rcsid[] = "$OpenBSD: lfs.c,v 1.4 2001/11/05 07:39:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: lfs.c,v 1.5 2002/02/16 21:27:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -168,9 +168,9 @@ struct direct lfs_lf_dir[] = {
 };
 
 static daddr_t make_dinode 
-	__P((ino_t, struct dinode *, int, daddr_t, struct lfs *));
-static void make_dir __P(( void *, struct direct *, int));
-static void put __P((int, off_t, void *, size_t));
+(ino_t, struct dinode *, int, daddr_t, struct lfs *);
+static void make_dir( void *, struct direct *, int);
+static void put(int, off_t, void *, size_t);
 
 int
 make_lfs(fd, lp, partp, minfree, block_size, frag_size, seg_size)
diff --git a/sbin/newlfs/newfs.c b/sbin/newlfs/newfs.c
index f41d4101ca5..db9881658fa 100644
--- a/sbin/newlfs/newfs.c
+++ b/sbin/newlfs/newfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: newfs.c,v 1.8 1999/08/17 09:13:14 millert Exp $	*/
+/*	$OpenBSD: newfs.c,v 1.9 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: newfs.c,v 1.5 1996/05/16 07:17:50 thorpej Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)newfs.c	8.5 (Berkeley) 5/24/95";
 #else
-static char rcsid[] = "$OpenBSD: newfs.c,v 1.8 1999/08/17 09:13:14 millert Exp $";
+static char rcsid[] = "$OpenBSD: newfs.c,v 1.9 2002/02/16 21:27:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -118,10 +118,10 @@ int	unlabeled;
 char	device[MAXPATHLEN];
 char	*progname, *special;
 
-static struct disklabel *getdisklabel __P((char *, int));
-static struct disklabel *debug_readlabel __P((int));
-static void rewritelabel __P((char *, int, struct disklabel *));
-static void usage __P((void));
+static struct disklabel *getdisklabel(char *, int);
+static struct disklabel *debug_readlabel(int);
+static void rewritelabel(char *, int, struct disklabel *);
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/nfsd/nfsd.c b/sbin/nfsd/nfsd.c
index 863d527636b..db151202a95 100644
--- a/sbin/nfsd/nfsd.c
+++ b/sbin/nfsd/nfsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfsd.c,v 1.15 2001/08/12 12:03:02 heko Exp $	*/
+/*	$OpenBSD: nfsd.c,v 1.16 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: nfsd.c,v 1.19 1996/02/18 23:18:56 mycroft Exp $	*/
 
 /*
@@ -111,9 +111,9 @@ struct timeval	ktv;
 NFSKERBKEYSCHED_T kerb_keysched;
 #endif
 
-void	nonfs __P((int));
-void	reapchild __P((int));
-void	usage __P((void));
+void	nonfs(int);
+void	reapchild(int);
+void	usage(void);
 
 /*
  * Nfs server daemon mostly just a user context for nfssvc()
diff --git a/sbin/pdisk/file_media.c b/sbin/pdisk/file_media.c
index 043bb0596bc..9e518958f3f 100644
--- a/sbin/pdisk/file_media.c
+++ b/sbin/pdisk/file_media.c
@@ -58,7 +58,7 @@
  */
 #ifdef __linux__
 #define LOFF_MAX 9223372036854775807LL
-extern __loff_t llseek __P ((int __fd, __loff_t __offset, int __whence));
+extern __loff_t llseek(int __fd, __loff_t __offset, int __whence);
 #else
 #define loff_t long
 #define llseek lseek
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 98e627e25e7..ccf24ad1ec8 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ping.c,v 1.48 2002/01/28 08:08:20 hugh Exp $	*/
+/*	$OpenBSD: ping.c,v 1.49 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #else
-static char rcsid[] = "$OpenBSD: ping.c,v 1.48 2002/01/28 08:08:20 hugh Exp $";
+static char rcsid[] = "$OpenBSD: ping.c,v 1.49 2002/02/16 21:27:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -172,16 +172,16 @@ int reset_kerninfo;
 
 int bufspace = IP_MAXPACKET;
 
-void fill __P((char *, char *));
+void fill(char *, char *);
 void catcher(), prtsig(), finish(), summary(int);
-int in_cksum __P((u_short *, int));
+int in_cksum(u_short *, int);
 void pinger();
-char *pr_addr __P((in_addr_t));
-int check_icmph __P((struct ip *));
-void pr_icmph __P((struct icmp *));
-void pr_pack __P((char *, int, struct sockaddr_in *));
-void pr_retip __P((struct ip *));
-quad_t qsqrt __P((quad_t));
+char *pr_addr(in_addr_t);
+int check_icmph(struct ip *);
+void pr_icmph(struct icmp *);
+void pr_pack(char *, int, struct sockaddr_in *);
+void pr_retip(struct ip *);
+quad_t qsqrt(quad_t);
 void usage();
 
 int
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 0d66fb5ed79..955b261adde 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ping6.c,v 1.40 2001/11/17 22:26:50 deraadt Exp $	*/
+/*	$OpenBSD: ping6.c,v 1.41 2002/02/16 21:27:37 millert Exp $	*/
 /*	$KAME: ping6.c,v 1.129 2001/06/22 13:16:02 itojun Exp $	*/
 
 /*
@@ -253,36 +253,36 @@ volatile sig_atomic_t seenint;
 volatile sig_atomic_t seeninfo;
 #endif
 
-int	 main __P((int, char *[]));
-void	 fill __P((char *, char *));
-int	 get_hoplim __P((struct msghdr *));
-int	 get_pathmtu __P((struct msghdr *));
-struct in6_pktinfo *get_rcvpktinfo __P((struct msghdr *));
-void	 onsignal __P((int));
-void	 retransmit __P((void));
-void	 onint __P((int));
-size_t	 pingerlen __P((void));
-int	 pinger __P((void));
-const char *pr_addr __P((struct sockaddr *, int));
-void	 pr_icmph __P((struct icmp6_hdr *, u_char *));
-void	 pr_iph __P((struct ip6_hdr *));
-void	 pr_suptypes __P((struct icmp6_nodeinfo *, size_t));
-void	 pr_nodeaddr __P((struct icmp6_nodeinfo *, int));
-int	 myechoreply __P((const struct icmp6_hdr *));
-int	 mynireply __P((const struct icmp6_nodeinfo *));
+int	 main(int, char *[]);
+void	 fill(char *, char *);
+int	 get_hoplim(struct msghdr *);
+int	 get_pathmtu(struct msghdr *);
+struct in6_pktinfo *get_rcvpktinfo(struct msghdr *);
+void	 onsignal(int);
+void	 retransmit(void);
+void	 onint(int);
+size_t	 pingerlen(void);
+int	 pinger(void);
+const char *pr_addr(struct sockaddr *, int);
+void	 pr_icmph(struct icmp6_hdr *, u_char *);
+void	 pr_iph(struct ip6_hdr *);
+void	 pr_suptypes(struct icmp6_nodeinfo *, size_t);
+void	 pr_nodeaddr(struct icmp6_nodeinfo *, int);
+int	 myechoreply(const struct icmp6_hdr *);
+int	 mynireply(const struct icmp6_nodeinfo *);
 char *dnsdecode __P((const u_char **, const u_char *, const u_char *,
 	u_char *, size_t));
-void	 pr_pack __P((u_char *, int, struct msghdr *));
-void	 pr_exthdrs __P((struct msghdr *));
-void	 pr_ip6opt __P((void *));
-void	 pr_rthdr __P((void *));
-int	 pr_bitrange __P((u_int32_t, int, int));
-void	 pr_retip __P((struct ip6_hdr *, u_char *));
-void	 summary __P((void));
-void	 tvsub __P((struct timeval *, struct timeval *));
-int	 setpolicy __P((int, char *));
-char	*nigroup __P((char *));
-void	 usage __P((void));
+void	 pr_pack(u_char *, int, struct msghdr *);
+void	 pr_exthdrs(struct msghdr *);
+void	 pr_ip6opt(void *);
+void	 pr_rthdr(void *);
+int	 pr_bitrange(u_int32_t, int, int);
+void	 pr_retip(struct ip6_hdr *, u_char *);
+void	 summary(void);
+void	 tvsub(struct timeval *, struct timeval *);
+int	 setpolicy(int, char *);
+char	*nigroup(char *);
+void	 usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 5e17e285216..b49a0e0fc06 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quotacheck.c,v 1.11 2001/11/05 07:39:17 mpech Exp $	*/
+/*	$OpenBSD: quotacheck.c,v 1.12 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: quotacheck.c,v 1.12 1996/03/30 22:34:25 mark Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)quotacheck.c	8.3 (Berkeley) 1/29/94";
 #else
-static char rcsid[] = "$OpenBSD: quotacheck.c,v 1.11 2001/11/05 07:39:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: quotacheck.c,v 1.12 2002/02/16 21:27:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -112,23 +112,23 @@ int	fi;			/* open disk file descriptor */
 u_long	highid[MAXQUOTAS];	/* highest addid()'ed identifier per type */
 
 struct fileusage *
-	 addid __P((u_long, int, char *));
-char	*blockcheck __P((char *));
-void	 bread __P((daddr_t, char *, long));
+	 addid(u_long, int, char *);
+char	*blockcheck(char *);
+void	 bread(daddr_t, char *, long);
 int	 chkquota __P((const char *, const char *,
 			const char *, void *, pid_t *));
-void	 freeinodebuf __P((void));
+void	 freeinodebuf(void);
 struct dinode *
-	 getnextinode __P((ino_t));
-int	 getquotagid __P((void));
-int	 hasquota __P((struct fstab *, int, char **));
+	 getnextinode(ino_t);
+int	 getquotagid(void);
+int	 hasquota(struct fstab *, int, char **);
 struct fileusage *
-	 lookup __P((u_long, int));
-void	*needchk __P((struct fstab *));
-int	 oneof __P((char *, char*[], int));
-void	 resetinodebuf __P((void));
-int	 update __P((const char *, const char *, int));
-void	 usage __P((void));
+	 lookup(u_long, int);
+void	*needchk(struct fstab *);
+int	 oneof(char *, char*[], int);
+void	 resetinodebuf(void);
+int	 update(const char *, const char *, int);
+void	 usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/raidctl/raidctl.c b/sbin/raidctl/raidctl.c
index b61a8586094..5a769713b12 100644
--- a/sbin/raidctl/raidctl.c
+++ b/sbin/raidctl/raidctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raidctl.c,v 1.8 2001/12/29 21:54:57 tdeval Exp $	*/
+/*	$OpenBSD: raidctl.c,v 1.9 2002/02/16 21:27:37 millert Exp $	*/
 /*      $NetBSD: raidctl.c,v 1.27 2001/07/10 01:30:52 lukem Exp $   */
 
 /*-
@@ -67,27 +67,27 @@
 
 extern  char *__progname;
 
-int     main __P((int, char *[]));
-void	do_ioctl __P((int, u_long, void *, const char *));
-static  void rf_configure __P((int, char*, int));
-static  const char *device_status __P((RF_DiskStatus_t));
-static  void rf_get_device_status __P((int));
-static	void rf_output_configuration __P((int, const char *));
-static  void get_component_number __P((int, char *, int *, int *));
-static  void rf_fail_disk __P((int, char *, int));
-static  void usage __P((void));
-static  void get_component_label __P((int, char *));
-static  void set_component_label __P((int, char *));
-static  void init_component_labels __P((int, int));
-static  void set_autoconfig __P((int, int, char *));
-static  void add_hot_spare __P((int, char *));
-static  void remove_hot_spare __P((int, char *));
-static  void rebuild_in_place __P((int, char *));
-static  void check_status __P((int,int));
-static  void check_parity __P((int,int,char *));
-static  void do_meter __P((int, u_long));
-static  void get_bar __P((char *, double, int));
-static  void get_time_string __P((char *, int));
+int     main(int, char *[]);
+void	do_ioctl(int, u_long, void *, const char *);
+static  void rf_configure(int, char*, int);
+static  const char *device_status(RF_DiskStatus_t);
+static  void rf_get_device_status(int);
+static	void rf_output_configuration(int, const char *);
+static  void get_component_number(int, char *, int *, int *);
+static  void rf_fail_disk(int, char *, int);
+static  void usage(void);
+static  void get_component_label(int, char *);
+static  void set_component_label(int, char *);
+static  void init_component_labels(int, int);
+static  void set_autoconfig(int, int, char *);
+static  void add_hot_spare(int, char *);
+static  void remove_hot_spare(int, char *);
+static  void rebuild_in_place(int, char *);
+static  void check_status(int,int);
+static  void check_parity(int,int,char *);
+static  void do_meter(int, u_long);
+static  void get_bar(char *, double, int);
+static  void get_time_string(char *, int);
 
 int verbose;
 
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index 841eaebcabf..5ef0cbc3c73 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reboot.c,v 1.22 2001/11/05 07:39:17 mpech Exp $	*/
+/*	$OpenBSD: reboot.c,v 1.23 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: reboot.c,v 1.8 1995/10/05 05:36:22 mycroft Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)reboot.c	8.1 (Berkeley) 6/5/93";
 #else
-static char rcsid[] = "$OpenBSD: reboot.c,v 1.22 2001/11/05 07:39:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: reboot.c,v 1.23 2002/02/16 21:27:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -66,7 +66,7 @@ static char rcsid[] = "$OpenBSD: reboot.c,v 1.22 2001/11/05 07:39:17 mpech Exp $
 #include <paths.h>
 #include <util.h>
 
-void usage __P((void));
+void usage(void);
 extern char *__progname;
 
 #define _PATH_RC	"/etc/rc"
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index 1f9223afd3e..a562c9a2058 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dirs.c,v 1.18 2001/11/05 07:39:17 mpech Exp $	*/
+/*	$OpenBSD: dirs.c,v 1.19 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: dirs.c,v 1.26 1997/07/01 05:37:49 lukem Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)dirs.c	8.5 (Berkeley) 8/31/94";
 #else
-static char rcsid[] = "$OpenBSD: dirs.c,v 1.18 2001/11/05 07:39:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: dirs.c,v 1.19 2002/02/16 21:27:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -125,16 +125,16 @@ struct odirect {
 	char	d_name[ODIRSIZ];
 };
 
-static struct inotab	*allocinotab __P((ino_t, struct dinode *, long));
-static void		 dcvt __P((struct odirect *, struct direct *));
-static void		 flushent __P((void));
-static struct inotab	*inotablookup __P((ino_t));
-static RST_DIR		*opendirfile __P((const char *));
-static void		 putdir __P((char *, long));
-static void		 putent __P((struct direct *));
-static void		 rst_seekdir __P((RST_DIR *, long, long));
-static long		 rst_telldir __P((RST_DIR *));
-static struct direct	*searchdir __P((ino_t, char *));
+static struct inotab	*allocinotab(ino_t, struct dinode *, long);
+static void		 dcvt(struct odirect *, struct direct *);
+static void		 flushent(void);
+static struct inotab	*inotablookup(ino_t);
+static RST_DIR		*opendirfile(const char *);
+static void		 putdir(char *, long);
+static void		 putent(struct direct *);
+static void		 rst_seekdir(RST_DIR *, long, long);
+static long		 rst_telldir(RST_DIR *);
+static struct direct	*searchdir(ino_t, char *);
 
 /*
  *	Extract directory contents, building up a directory structure
@@ -231,7 +231,7 @@ void
 treescan(pname, ino, todo)
 	char *pname;
 	ino_t ino;
-	long (*todo) __P((char *, ino_t, int));
+	long (*todo)(char *, ino_t, int);
 {
 	struct inotab *itp;
 	struct direct *dp;
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index 134906612e3..8582ba184dc 100644
--- a/sbin/restore/extern.h
+++ b/sbin/restore/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.3 1997/07/05 20:51:21 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.4 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.4 1995/03/18 14:59:43 cgd Exp $	*/
 
 /*-
@@ -36,78 +36,78 @@
  *	@(#)extern.h	8.2 (Berkeley) 1/7/94
  */
 
-struct entry	*addentry __P((char *, ino_t, int));
-long		 addfile __P((char *, ino_t, int));
-int		 addwhiteout __P((char *));
-void		 badentry __P((struct entry *, char *));
-void	 	 canon __P((char *, char *));
-void		 checkrestore __P((void));
-void 		 cleanup __P((void));
-void		 closemt __P((void));
-void		 createfiles __P((void));
-void		 createleaves __P((char *));
-void		 createlinks __P((void));
-long		 deletefile __P((char *, ino_t, int));
-void		 deleteino __P((ino_t));
-void		 delwhiteout __P((struct entry *));
-ino_t		 dirlookup __P((const char *));
-void		 dumpsymtable __P((char *, long));
-void	 	 extractdirs __P((int));
-int		 extractfile __P((char *));
-void		 findunreflinks __P((void));
-char		*flagvalues __P((struct entry *));
-void		 freeentry __P((struct entry *));
-void		 freename __P((char *));
-int	 	 genliteraldir __P((char *, ino_t));
-char		*gentempname __P((struct entry *));
+struct entry	*addentry(char *, ino_t, int);
+long		 addfile(char *, ino_t, int);
+int		 addwhiteout(char *);
+void		 badentry(struct entry *, char *);
+void	 	 canon(char *, char *);
+void		 checkrestore(void);
+void 		 cleanup(void);
+void		 closemt(void);
+void		 createfiles(void);
+void		 createleaves(char *);
+void		 createlinks(void);
+long		 deletefile(char *, ino_t, int);
+void		 deleteino(ino_t);
+void		 delwhiteout(struct entry *);
+ino_t		 dirlookup(const char *);
+void		 dumpsymtable(char *, long);
+void	 	 extractdirs(int);
+int		 extractfile(char *);
+void		 findunreflinks(void);
+char		*flagvalues(struct entry *);
+void		 freeentry(struct entry *);
+void		 freename(char *);
+int	 	 genliteraldir(char *, ino_t);
+char		*gentempname(struct entry *);
 void		 getfile __P((void (*)(char *, long), void (*)(char *, long)));
-void		 getvol __P((long));
-void		 initsymtable __P((char *));
-int	 	 inodetype __P((ino_t));
-int		 linkit __P((char *, char *, int));
-struct entry	*lookupino __P((ino_t));
-struct entry	*lookupname __P((char *));
-long		 listfile __P((char *, ino_t, int));
-ino_t		 lowerbnd __P((ino_t));
-void		 mktempname __P((struct entry *));
-void		 moveentry __P((struct entry *, char *));
-void		 msg __P((const char *, ...));
-char		*myname __P((struct entry *));
-void		 newnode __P((struct entry *));
-void		 newtapebuf __P((long));
-long		 nodeupdates __P((char *, ino_t, int));
-void	 	 onintr __P((int));
-void		 panic __P((const char *, ...));
-void		 pathcheck __P((char *));
-struct direct	*pathsearch __P((const char *));
-void		 printdumpinfo __P((void));
-void		 removeleaf __P((struct entry *));
-void		 removenode __P((struct entry *));
-void		 removeoldleaves __P((void));
-void		 removeoldnodes __P((void));
-void		 renameit __P((char *, char *));
-int		 reply __P((char *));
-RST_DIR		*rst_opendir __P((const char *));
-struct direct	*rst_readdir __P((RST_DIR *));
-void		 rst_closedir __P((RST_DIR *dirp));
-void	 	 runcmdshell __P((void));
-char		*savename __P((char *));
-void	 	 setdirmodes __P((int));
-void		 setinput __P((char *));
-void		 setup __P((void));
-void	 	 skipdirs __P((void));
-void		 skipfile __P((void));
-void		 skipmaps __P((void));
-void		 swabst __P((u_char *, u_char *));
+void		 getvol(long);
+void		 initsymtable(char *);
+int	 	 inodetype(ino_t);
+int		 linkit(char *, char *, int);
+struct entry	*lookupino(ino_t);
+struct entry	*lookupname(char *);
+long		 listfile(char *, ino_t, int);
+ino_t		 lowerbnd(ino_t);
+void		 mktempname(struct entry *);
+void		 moveentry(struct entry *, char *);
+void		 msg(const char *, ...);
+char		*myname(struct entry *);
+void		 newnode(struct entry *);
+void		 newtapebuf(long);
+long		 nodeupdates(char *, ino_t, int);
+void	 	 onintr(int);
+void		 panic(const char *, ...);
+void		 pathcheck(char *);
+struct direct	*pathsearch(const char *);
+void		 printdumpinfo(void);
+void		 removeleaf(struct entry *);
+void		 removenode(struct entry *);
+void		 removeoldleaves(void);
+void		 removeoldnodes(void);
+void		 renameit(char *, char *);
+int		 reply(char *);
+RST_DIR		*rst_opendir(const char *);
+struct direct	*rst_readdir(RST_DIR *);
+void		 rst_closedir(RST_DIR *dirp);
+void	 	 runcmdshell(void);
+char		*savename(char *);
+void	 	 setdirmodes(int);
+void		 setinput(char *);
+void		 setup(void);
+void	 	 skipdirs(void);
+void		 skipfile(void);
+void		 skipmaps(void);
+void		 swabst(u_char *, u_char *);
 void	 	 treescan __P((char *, ino_t, long (*)(char *, ino_t, int)));
-ino_t		 upperbnd __P((ino_t));
-long		 verifyfile __P((char *, ino_t, int));
-void		 xtrnull __P((char *, long));
+ino_t		 upperbnd(ino_t);
+long		 verifyfile(char *, ino_t, int);
+void		 xtrnull(char *, long);
 
 /* From ../dump/dumprmt.c */
-void		rmtclose __P((void));
-int		rmthost __P((char *));
-int		rmtioctl __P((int, int));
-int		rmtopen __P((char *, int));
-int		rmtread __P((char *, int));
-int		rmtseek __P((int, int));
+void		rmtclose(void);
+int		rmthost(char *);
+int		rmtioctl(int, int);
+int		rmtopen(char *, int);
+int		rmtread(char *, int);
+int		rmtseek(int, int);
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 3a7d101157b..8d6a8ac3965 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interactive.c,v 1.13 2001/11/05 07:39:17 mpech Exp $	*/
+/*	$OpenBSD: interactive.c,v 1.14 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: interactive.c,v 1.10 1997/03/19 08:42:52 lukem Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)interactive.c	8.3 (Berkeley) 9/13/94";
 #else
-static char rcsid[] = "$OpenBSD: interactive.c,v 1.13 2001/11/05 07:39:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: interactive.c,v 1.14 2002/02/16 21:27:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -87,14 +87,14 @@ struct arglist {
 	char	*cmd;		/* the current command */
 };
 
-static char	*copynext __P((char *, char *));
-static int	 fcmp __P((const void *, const void *));
-static void	 formatf __P((struct afile *, int));
-static void	 getcmd __P((char *, char *, char *, struct arglist *));
-struct dirent	*glob_readdir __P((RST_DIR *dirp));
-static int	 glob_stat __P((const char *, struct stat *));
-static void	 mkentry __P((char *, struct direct *, struct afile *));
-static void	 printlist __P((char *, char *));
+static char	*copynext(char *, char *);
+static int	 fcmp(const void *, const void *);
+static void	 formatf(struct afile *, int);
+static void	 getcmd(char *, char *, char *, struct arglist *);
+struct dirent	*glob_readdir(RST_DIR *dirp);
+static int	 glob_stat(const char *, struct stat *);
+static void	 mkentry(char *, struct direct *, struct afile *);
+static void	 printlist(char *, char *);
 
 /*
  * Read and execute commands from the terminal.
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 3c945871d92..706f7ff729d 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.10 2001/06/04 14:59:49 mickey Exp $	*/
+/*	$OpenBSD: main.c,v 1.11 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: main.c,v 1.13 1997/07/01 05:37:51 lukem Exp $	*/
 
 /*
@@ -80,8 +80,8 @@ time_t	dumpdate;
 FILE 	*terminal;
 char	*tmpdir;
 
-static void obsolete __P((int *, char **[]));
-static void usage __P((void));
+static void obsolete(int *, char **[]);
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index 6087f286de5..a05abf8404d 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: restore.c,v 1.6 2001/11/05 07:39:17 mpech Exp $	*/
+/*	$OpenBSD: restore.c,v 1.7 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: restore.c,v 1.9 1997/06/18 07:10:16 lukem Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)restore.c	8.3 (Berkeley) 9/13/94";
 #else
-static char rcsid[] = "$OpenBSD: restore.c,v 1.6 2001/11/05 07:39:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: restore.c,v 1.7 2002/02/16 21:27:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -53,7 +53,7 @@ static char rcsid[] = "$OpenBSD: restore.c,v 1.6 2001/11/05 07:39:17 mpech Exp $
 #include "restore.h"
 #include "extern.h"
 
-static char *keyval __P((int));
+static char *keyval(int);
 
 /*
  * This implements the 't' option.
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index 9c8427afb14..d7fb03747cf 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: symtab.c,v 1.6 2001/11/05 07:39:17 mpech Exp $	*/
+/*	$OpenBSD: symtab.c,v 1.7 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: symtab.c,v 1.10 1997/03/19 08:42:54 lukem Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)symtab.c	8.2 (Berkeley) 9/13/94";
 #else
-static char rcsid[] = "$OpenBSD: symtab.c,v 1.6 2001/11/05 07:39:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: symtab.c,v 1.7 2002/02/16 21:27:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -77,9 +77,9 @@ static char rcsid[] = "$OpenBSD: symtab.c,v 1.6 2001/11/05 07:39:17 mpech Exp $"
 static struct entry **entry;
 static long entrytblsize;
 
-static void		 addino __P((ino_t, struct entry *));
-static struct entry	*lookupparent __P((char *));
-static void		 removeentry __P((struct entry *));
+static void		 addino(ino_t, struct entry *);
+static struct entry	*lookupparent(char *);
+static void		 removeentry(struct entry *);
 
 /*
  * Look up an entry by inode number
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 10256e459cc..35bb32e7c05 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tape.c,v 1.19 2001/11/05 07:39:17 mpech Exp $	*/
+/*	$OpenBSD: tape.c,v 1.20 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: tape.c,v 1.26 1997/04/15 07:12:25 lukem Exp $	*/
 
 /*
@@ -93,23 +93,23 @@ static int	Qcvt;		/* Swap quads (for sun) */
 
 #define	FLUSHTAPEBUF()	blkcnt = ntrec + 1
 
-static void	 accthdr __P((struct s_spcl *));
-static int	 checksum __P((int *));
-static void	 findinode __P((struct s_spcl *));
-static void	 findtapeblksize __P((void));
-static int	 gethead __P((struct s_spcl *));
-static void	 readtape __P((char *));
-static void	 setdumpnum __P((void));
-static u_long	 swabl __P((u_long));
-static u_char	*swablong __P((u_char *, int));
-static u_char	*swabshort __P((u_char *, int));
-static void	 terminateinput __P((void));
-static void	 xtrfile __P((char *, long));
-static void	 xtrlnkfile __P((char *, long));
-static void	 xtrlnkskip __P((char *, long));
-static void	 xtrmap __P((char *, long));
-static void	 xtrmapskip __P((char *, long));
-static void	 xtrskip __P((char *, long));
+static void	 accthdr(struct s_spcl *);
+static int	 checksum(int *);
+static void	 findinode(struct s_spcl *);
+static void	 findtapeblksize(void);
+static int	 gethead(struct s_spcl *);
+static void	 readtape(char *);
+static void	 setdumpnum(void);
+static u_long	 swabl(u_long);
+static u_char	*swablong(u_char *, int);
+static u_char	*swabshort(u_char *, int);
+static void	 terminateinput(void);
+static void	 xtrfile(char *, long);
+static void	 xtrlnkfile(char *, long);
+static void	 xtrlnkskip(char *, long);
+static void	 xtrmap(char *, long);
+static void	 xtrmapskip(char *, long);
+static void	 xtrskip(char *, long);
 
 /*
  * Set up an input source
@@ -642,8 +642,8 @@ skipfile()
  */
 void
 getfile(fill, skip)
-	void	(*fill) __P((char *, long));
-	void	(*skip) __P((char *, long));
+	void	(*fill)(char *, long);
+	void	(*skip)(char *, long);
 {
 	int i;
 	volatile int curblk = 0;
diff --git a/sbin/route/ccitt_addr.c b/sbin/route/ccitt_addr.c
index 5f4a1d4db98..b75fc51fe7c 100644
--- a/sbin/route/ccitt_addr.c
+++ b/sbin/route/ccitt_addr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccitt_addr.c,v 1.5 2000/09/24 01:02:23 millert Exp $	*/
+/*	$OpenBSD: ccitt_addr.c,v 1.6 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: ccitt_addr.c,v 1.8 1995/04/23 10:33:41 cgd Exp $	*/
 
 /*
@@ -59,7 +59,7 @@
 #include <sys/socket.h>
 #include <netccitt/x25.h>
 
-static char *copychar __P((char *, char *));
+static char *copychar(char *, char *);
 
 int
 ccitt_addr (addr, xp)
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 76a7bfbdbf4..f4d79899389 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.43 2001/07/07 18:26:20 deraadt Exp $	*/
+/*	$OpenBSD: route.c,v 1.44 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: route.c,v 1.16 1996/04/15 18:27:05 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)route.c	8.3 (Berkeley) 3/19/94";
 #else
-static char rcsid[] = "$OpenBSD: route.c,v 1.43 2001/07/07 18:26:20 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: route.c,v 1.44 2002/02/16 21:27:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -99,27 +99,27 @@ struct	rt_metrics rt_metrics;
 u_long  rtm_inits;
 uid_t	uid;
 
-char	*routename __P((struct sockaddr *));
-char	*netname __P((struct sockaddr *));
-void	 flushroutes __P((int, char **));
-int	 newroute __P((int, char **));
-void	 monitor __P((void));
+char	*routename(struct sockaddr *);
+char	*netname(struct sockaddr *);
+void	 flushroutes(int, char **);
+int	 newroute(int, char **);
+void	 monitor(void);
 #ifdef INET6
-static int prefixlen __P((char *));
+static int prefixlen(char *);
 #endif
-void	 sockaddr __P((char *, struct sockaddr *));
-void	 sodump __P((sup, char *));
-void	 print_getmsg __P((struct rt_msghdr *, int));
-void	 print_rtmsg __P((struct rt_msghdr *, int));
-void	 pmsg_common __P((struct rt_msghdr *));
-void	 pmsg_addrs __P((char *, int));
-void	 bprintf __P((FILE *, int, u_char *));
-void	 mask_addr __P((void));
-int	 getaddr __P((int, char *, struct hostent **));
-int	 rtmsg __P((int, int));
-int	 x25_makemask __P((void));
-
-extern void show __P((int, char **));	/* XXX - from show.c */
+void	 sockaddr(char *, struct sockaddr *);
+void	 sodump(sup, char *);
+void	 print_getmsg(struct rt_msghdr *, int);
+void	 print_rtmsg(struct rt_msghdr *, int);
+void	 pmsg_common(struct rt_msghdr *);
+void	 pmsg_addrs(char *, int);
+void	 bprintf(FILE *, int, u_char *);
+void	 mask_addr(void);
+int	 getaddr(int, char *, struct hostent **);
+int	 rtmsg(int, int);
+int	 x25_makemask(void);
+
+extern void show(int, char **);	/* XXX - from show.c */
 
 __dead void
 usage(cp)
diff --git a/sbin/route/show.c b/sbin/route/show.c
index ee4efc6c331..43dd527fad4 100644
--- a/sbin/route/show.c
+++ b/sbin/route/show.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: show.c,v 1.20 2001/07/07 18:26:20 deraadt Exp $	*/
+/*	$OpenBSD: show.c,v 1.21 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: show.c,v 1.1 1996/11/15 18:01:41 gwr Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)route.c	8.3 (Berkeley) 3/9/94";
 #else
-static char *rcsid = "$OpenBSD: show.c,v 1.20 2001/07/07 18:26:20 deraadt Exp $";
+static char *rcsid = "$OpenBSD: show.c,v 1.21 2002/02/16 21:27:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -67,9 +67,9 @@ static char *rcsid = "$OpenBSD: show.c,v 1.20 2001/07/07 18:26:20 deraadt Exp $"
 #include <unistd.h>
 
 /* XXX: things from route.c */
-extern char *routename __P((struct sockaddr *));
-extern char *netname __P((struct sockaddr *));
-extern char *ns_print __P((struct sockaddr_ns *));
+extern char *routename(struct sockaddr *);
+extern char *netname(struct sockaddr *);
+extern char *ns_print(struct sockaddr_ns *);
 extern int nflag;
 
 #define ROUNDUP(a) \
@@ -102,11 +102,11 @@ static const struct bits bits[] = {
 	{ 0 }
 };
 
-static void p_rtentry __P((struct rt_msghdr *));
-static void p_sockaddr __P((struct sockaddr *, int, int));
-static void p_flags __P((int, char *));
-static void pr_rthdr __P((void));
-static void pr_family __P((int));
+static void p_rtentry(struct rt_msghdr *);
+static void p_sockaddr(struct sockaddr *, int, int);
+static void p_flags(int, char *);
+static void pr_rthdr(void);
+static void pr_family(int);
 
 int	keyword(char *);
 void	usage(char *);
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index 58ffca3daa2..b6014ab69d6 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: savecore.c,v 1.27 2001/11/05 07:39:17 mpech Exp $	*/
+/*	$OpenBSD: savecore.c,v 1.28 2002/02/16 21:27:37 millert Exp $	*/
 /*	$NetBSD: savecore.c,v 1.26 1996/03/18 21:16:05 leo Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)savecore.c	8.3 (Berkeley) 1/2/94";
 #else
-static char rcsid[] = "$OpenBSD: savecore.c,v 1.27 2001/11/05 07:39:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: savecore.c,v 1.28 2002/02/16 21:27:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -70,7 +70,7 @@ static char rcsid[] = "$OpenBSD: savecore.c,v 1.27 2001/11/05 07:39:17 mpech Exp
 #include <kvm.h>
 #include <vis.h>
 
-extern FILE *zopen __P((const char *fname, const char *mode, int bits));
+extern FILE *zopen(const char *fname, const char *mode, int bits);
 
 #define KREAD(kd, addr, p)\
 	(kvm_read(kd, addr, (char *)(p), sizeof(*(p))) != sizeof(*(p)))
@@ -124,21 +124,21 @@ char	vers[1024];
 
 int	clear, compress, force, verbose;	/* flags */
 
-void	 check_kmem __P((void));
-int	 check_space __P((void));
-void	 clear_dump __P((void));
-int	 Create __P((char *, int));
-int	 dump_exists __P((void));
-char	*find_dev __P((dev_t, int));
-int	 get_crashtime __P((void));
-void	 kmem_setup __P((void));
-void	 log __P((int, char *, ...));
-void	 Lseek __P((int, off_t, int));
-int	 Open __P((char *, int rw));
-char	*rawname __P((char *s));
-void	 save_core __P((void));
-void	 usage __P((void));
-void	 Write __P((int, void *, int));
+void	 check_kmem(void);
+int	 check_space(void);
+void	 clear_dump(void);
+int	 Create(char *, int);
+int	 dump_exists(void);
+char	*find_dev(dev_t, int);
+int	 get_crashtime(void);
+void	 kmem_setup(void);
+void	 log(int, char *, ...);
+void	 Lseek(int, off_t, int);
+int	 Open(char *, int rw);
+char	*rawname(char *s);
+void	 save_core(void);
+void	 usage(void);
+void	 Write(int, void *, int);
 
 int
 main(argc, argv)
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index f128feb6ffb..bd8770f1fa4 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shutdown.c,v 1.23 2001/11/05 07:39:17 mpech Exp $	*/
+/*	$OpenBSD: shutdown.c,v 1.24 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: shutdown.c,v 1.9 1995/03/18 15:01:09 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)shutdown.c	8.2 (Berkeley) 2/16/94";
 #else
-static char rcsid[] = "$OpenBSD: shutdown.c,v 1.23 2001/11/05 07:39:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: shutdown.c,v 1.24 2002/02/16 21:27:38 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -106,16 +106,16 @@ static time_t offset, shuttime;
 static int dofast, dohalt, doreboot, dopower, dodump, killflg, mbuflen, nosync;
 static char *whom, mbuf[BUFSIZ];
 
-void badtime __P((void));
-void __attribute ((noreturn)) die_you_gravy_sucking_pig_dog __P((void));
-void doitfast __P((void));
-void __attribute ((noreturn)) finish __P((int));
-void getoffset __P((char *));
-void __attribute ((noreturn)) loop __P((void));
-void nolog __P((void));
-void timeout __P((int));
-void timewarn __P((int));
-void usage __P((void));
+void badtime(void);
+void __attribute ((noreturn)) die_you_gravy_sucking_pig_dog(void);
+void doitfast(void);
+void __attribute ((noreturn)) finish(int);
+void getoffset(char *);
+void __attribute ((noreturn)) loop(void);
+void nolog(void);
+void timeout(int);
+void timewarn(int);
+void usage(void);
 
 int
 main(argc, argv)
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index a4ce1fc9ed6..0a8bd7280fb 100644
--- a/sbin/slattach/slattach.c
+++ b/sbin/slattach/slattach.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: slattach.c,v 1.11 2001/11/17 19:56:36 deraadt Exp $	*/
+/*	$OpenBSD: slattach.c,v 1.12 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: slattach.c,v 1.17 1996/05/19 21:57:39 jonathan Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)slattach.c	8.2 (Berkeley) 1/7/94";
 #else
-static char rcsid[] = "$OpenBSD: slattach.c,v 1.11 2001/11/17 19:56:36 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: slattach.c,v 1.12 2002/02/16 21:27:38 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -81,11 +81,11 @@ static char pidfilename[MAXPATHLEN];	/* name of pid file */
 static pid_t pid;			/* Our pid */
 static FILE *pidfile;
 
-void	usage __P((void));
+void	usage(void);
 
-int ttydisc __P((char *));
+int ttydisc(char *);
 
-void handler __P((int));
+void handler(int);
 
 volatile sig_atomic_t dying;
 
diff --git a/sbin/swapctl/swapctl.c b/sbin/swapctl/swapctl.c
index 7f065d7b78e..4e7d69fd6c0 100644
--- a/sbin/swapctl/swapctl.c
+++ b/sbin/swapctl/swapctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: swapctl.c,v 1.6 2001/06/04 14:59:50 mickey Exp $	*/
+/*	$OpenBSD: swapctl.c,v 1.7 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: swapctl.c,v 1.9 1998/07/26 20:23:15 mycroft Exp $	*/
 
 /*
@@ -105,15 +105,15 @@ char	*tflag;		/* swap device type (blk or noblk) */
 
 int	pri;		/* uses 0 as default pri */
 
-static	void change_priority __P((char *));
-static	void add_swap __P((char *));
-static	void del_swap __P((char *));
-	int  main __P((int, char *[]));
-static	void do_fstab __P((void));
-static	void usage __P((void));
-static	int  swapon_command __P((int, char **));
+static	void change_priority(char *);
+static	void add_swap(char *);
+static	void del_swap(char *);
+	int  main(int, char *[]);
+static	void do_fstab(void);
+static	void usage(void);
+static	int  swapon_command(int, char **);
 #if 0
-static	void swapoff_command __P((int, char **));
+static	void swapoff_command(int, char **);
 #endif
 
 extern	char *__progname;	/* from crt0.o */
diff --git a/sbin/swapctl/swapctl.h b/sbin/swapctl/swapctl.h
index 596d5989b60..2d294437e9b 100644
--- a/sbin/swapctl/swapctl.h
+++ b/sbin/swapctl/swapctl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: swapctl.h,v 1.2 2000/02/26 04:06:23 hugh Exp $	*/
+/*	$OpenBSD: swapctl.h,v 1.3 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: swapctl.h,v 1.2 1997/10/10 05:39:54 mrg Exp $	*/
 
 /*
@@ -30,4 +30,4 @@
  */
 
 /* pri, kflag, pflag, tflag, dolong (1 for long, 0 for short) */
-void list_swap __P((int, int, int, int, int));
+void list_swap(int, int, int, int, int);
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index bda459b89ff..6fdbf600ae3 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysctl.c,v 1.78 2001/12/04 14:57:27 art Exp $	*/
+/*	$OpenBSD: sysctl.c,v 1.79 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)sysctl.c	8.5 (Berkeley) 5/9/95";
 #else
-static char *rcsid = "$OpenBSD: sysctl.c,v 1.78 2001/12/04 14:57:27 art Exp $";
+static char *rcsid = "$OpenBSD: sysctl.c,v 1.79 2002/02/16 21:27:38 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -179,27 +179,27 @@ int	Aflag, aflag, nflag, wflag;
 #define KMEMSTATS	0x00001000
 
 /* prototypes */
-void debuginit __P((void));
-void listall __P((char *, struct list *));
-void parse __P((char *, int));
-void parse_baddynamic __P((int *, size_t, char *, void **, size_t *, int, int));
-void usage __P((void));
-int findname __P((char *, char *, char **, struct list *));
-int sysctl_inet __P((char *, char **, int *, int, int *));
+void debuginit(void);
+void listall(char *, struct list *);
+void parse(char *, int);
+void parse_baddynamic(int *, size_t, char *, void **, size_t *, int, int);
+void usage(void);
+int findname(char *, char *, char **, struct list *);
+int sysctl_inet(char *, char **, int *, int, int *);
 #ifdef INET6
-int sysctl_inet6 __P((char *, char **, int *, int, int *));
+int sysctl_inet6(char *, char **, int *, int, int *);
 #endif
-int sysctl_ipx __P((char *, char **, int *, int, int *));
-int sysctl_fs __P((char *, char **, int *, int, int *));
-static int sysctl_vfs __P((char *, char **, int[], int, int *));
-static int sysctl_vfsgen __P((char *, char **, int[], int, int *));
-int sysctl_bios __P((char *, char **, int *, int, int *));
-int sysctl_swpenc __P((char *, char **, int *, int, int *));
-int sysctl_forkstat __P((char *, char **, int *, int, int *));
-int sysctl_tty __P((char *, char **, int *, int, int *));
-int sysctl_nchstats __P((char *, char **, int *, int, int *));
-int sysctl_malloc __P((char *, char **, int *, int, int *));
-void vfsinit __P((void));
+int sysctl_ipx(char *, char **, int *, int, int *);
+int sysctl_fs(char *, char **, int *, int, int *);
+static int sysctl_vfs(char *, char **, int[], int, int *);
+static int sysctl_vfsgen(char *, char **, int[], int, int *);
+int sysctl_bios(char *, char **, int *, int, int *);
+int sysctl_swpenc(char *, char **, int *, int, int *);
+int sysctl_forkstat(char *, char **, int *, int, int *);
+int sysctl_tty(char *, char **, int *, int, int *);
+int sysctl_nchstats(char *, char **, int *, int, int *);
+int sysctl_malloc(char *, char **, int *, int, int *);
+void vfsinit(void);
 
 int
 main(argc, argv)
diff --git a/sbin/ttyflags/ttyflags.c b/sbin/ttyflags/ttyflags.c
index ade502488ee..138100472c4 100644
--- a/sbin/ttyflags/ttyflags.c
+++ b/sbin/ttyflags/ttyflags.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttyflags.c,v 1.7 1997/03/04 05:48:00 tholo Exp $	*/
+/*	$OpenBSD: ttyflags.c,v 1.8 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: ttyflags.c,v 1.8 1996/04/09 05:20:30 cgd Exp $	*/
 
 /*
@@ -39,7 +39,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: ttyflags.c,v 1.7 1997/03/04 05:48:00 tholo Exp $";
+static char rcsid[] = "$OpenBSD: ttyflags.c,v 1.8 2002/02/16 21:27:38 millert Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -57,10 +57,10 @@ static char rcsid[] = "$OpenBSD: ttyflags.c,v 1.7 1997/03/04 05:48:00 tholo Exp
 #include <ttyent.h>
 #include <unistd.h>
 
-int all __P((int));
-int ttys __P((char **, int));
-int ttyflags __P((struct ttyent *, int));
-void usage __P((void));
+int all(int);
+int ttys(char **, int);
+int ttyflags(struct ttyent *, int);
+void usage(void);
 
 int nflag, vflag;
 
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index c8c140bff52..d0a372fb022 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tunefs.c,v 1.18 2002/02/12 22:28:02 fgsch Exp $	*/
+/*	$OpenBSD: tunefs.c,v 1.19 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: tunefs.c,v 1.10 1995/03/18 15:01:31 cgd Exp $	*/
 
 /*
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tunefs.c	8.2 (Berkeley) 4/19/94";
 #else
 static const char rcsid[] =
-	"$OpenBSD: tunefs.c,v 1.18 2002/02/12 22:28:02 fgsch Exp $";
+	"$OpenBSD: tunefs.c,v 1.19 2002/02/16 21:27:38 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -81,8 +81,8 @@ long dev_bsize = 1;
 void bwrite(daddr_t, char *, int);
 int bread(daddr_t, char *, int);
 void getsb(struct fs *, char *, int);
-void usage __P((void));
-void printfs __P((void));
+void usage(void);
+void printfs(void);
 
 extern char *__progname;
 
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index ac06cbe20cf..f7406220f87 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umount.c,v 1.12 2001/05/18 08:07:51 mickey Exp $	*/
+/*	$OpenBSD: umount.c,v 1.13 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: umount.c,v 1.16 1996/05/11 14:13:55 mycroft Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)umount.c	8.3 (Berkeley) 2/20/94";
 #else
-static char rcsid[] = "$OpenBSD: umount.c,v 1.12 2001/05/18 08:07:51 mickey Exp $";
+static char rcsid[] = "$OpenBSD: umount.c,v 1.13 2002/02/16 21:27:38 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -74,14 +74,14 @@ int	fake, fflag, verbose;
 char	**typelist = NULL;
 char	*nfshost;
 
-char	*getmntname __P((char *, mntwhat, char *));
-void	 maketypelist __P((char *));
-int	 selected __P((const char *));
-int	 namematch __P((struct hostent *));
-int	 umountall __P((void));
-int	 umountfs __P((char *));
-void	 usage __P((void));
-int	 xdr_dir __P((XDR *, char *));
+char	*getmntname(char *, mntwhat, char *);
+void	 maketypelist(char *);
+int	 selected(const char *);
+int	 namematch(struct hostent *);
+int	 umountall(void);
+int	 umountfs(char *);
+void	 usage(void);
+int	 xdr_dir(XDR *, char *);
 
 int
 main(argc, argv)
diff --git a/sbin/wicontrol/wicontrol.c b/sbin/wicontrol/wicontrol.c
index f9c613e77eb..10d87fe02dc 100644
--- a/sbin/wicontrol/wicontrol.c
+++ b/sbin/wicontrol/wicontrol.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wicontrol.c,v 1.19 2001/08/17 00:40:11 millert Exp $	*/
+/*	$OpenBSD: wicontrol.c,v 1.20 2002/02/16 21:27:38 millert Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -67,25 +67,25 @@
 static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\
 	Bill Paul. All rights reserved.";
 static const char rcsid[] =
-	"@(#) $OpenBSD: wicontrol.c,v 1.19 2001/08/17 00:40:11 millert Exp $";
+	"@(#) $OpenBSD: wicontrol.c,v 1.20 2002/02/16 21:27:38 millert Exp $";
 #endif
 
-static void wi_getval		__P((char *, struct wi_req *));
-static void wi_setval		__P((char *, struct wi_req *));
-static void wi_printstr		__P((struct wi_req *));
-static void wi_setstr		__P((char *, int, char *));
-static void wi_setbytes		__P((char *, int, char *, int));
-static void wi_setword		__P((char *, int, char *));
-static void wi_sethex		__P((char *, int, char *));
-static void wi_printwords	__P((struct wi_req *));
-static void wi_printbool	__P((struct wi_req *));
-static void wi_printhex		__P((struct wi_req *));
-static void wi_dumpinfo		__P((char *));
-static void wi_setkeys		__P((char *, int, char *));
-static void wi_printkeys	__P((struct wi_req *));
-static void wi_printcardid	__P((struct wi_req *, int));
-static void wi_dumpstats	__P((char *));
-static void usage		__P((void));
+static void wi_getval(char *, struct wi_req *);
+static void wi_setval(char *, struct wi_req *);
+static void wi_printstr(struct wi_req *);
+static void wi_setstr(char *, int, char *);
+static void wi_setbytes(char *, int, char *, int);
+static void wi_setword(char *, int, char *);
+static void wi_sethex(char *, int, char *);
+static void wi_printwords(struct wi_req *);
+static void wi_printbool(struct wi_req *);
+static void wi_printhex(struct wi_req *);
+static void wi_dumpinfo(char *);
+static void wi_setkeys(char *, int, char *);
+static void wi_printkeys(struct wi_req *);
+static void wi_printcardid(struct wi_req *, int);
+static void wi_dumpstats(char *);
+static void usage(void);
 
 static void
 wi_getval(iface, wreq)
diff --git a/sbin/wsconsctl/keysym.c b/sbin/wsconsctl/keysym.c
index 36123d9d69a..c41c921c22d 100644
--- a/sbin/wsconsctl/keysym.c
+++ b/sbin/wsconsctl/keysym.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: keysym.c,v 1.1 2000/07/01 23:52:45 mickey Exp $	*/
+/*	$OpenBSD: keysym.c,v 1.2 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: keysym.c,v 1.3 1999/02/08 11:08:23 hannken Exp $ */
 
 /*-
@@ -87,12 +87,12 @@ static const u_char latin1_to_upper[256] = {
 	0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0x00,		/* f */
 };
 
-static int qcmp_name __P((const void *, const void *));
-static int qcmp_ksym __P((const void *, const void *));
-static int bcmp_name __P((const void *, const void *));
-static int bcmp_ksym __P((const void *, const void *));
+static int qcmp_name(const void *, const void *);
+static int qcmp_ksym(const void *, const void *);
+static int bcmp_name(const void *, const void *);
+static int bcmp_ksym(const void *, const void *);
 
-static void sort_ksym_tab __P((void));
+static void sort_ksym_tab(void);
 
 static int
 qcmp_name(a, b)
diff --git a/sbin/wsconsctl/map_parse.y b/sbin/wsconsctl/map_parse.y
index e96b521be5d..4ac444fe488 100644
--- a/sbin/wsconsctl/map_parse.y
+++ b/sbin/wsconsctl/map_parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: map_parse.y,v 1.2 2001/08/26 17:35:13 deraadt Exp $	*/
+/*	$OpenBSD: map_parse.y,v 1.3 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: map_parse.y,v 1.2 1999/02/08 11:08:23 hannken Exp $ */
 
 /*-
@@ -67,7 +67,7 @@ static struct wscons_keymap mapdata[KS_NUMKEYCODES];
 struct wskbd_map_data newkbmap;		/* used in util.c */
 static struct wscons_keymap *cur_mp;
 
-static int ksym_lookup __P((keysym_t));
+static int ksym_lookup(keysym_t);
 
 static int
 ksym_lookup(ksym)
diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c
index d645b5f8639..c555fa59426 100644
--- a/sbin/wsconsctl/util.c
+++ b/sbin/wsconsctl/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.6 2001/07/06 21:52:34 mickey Exp $ */
+/*	$OpenBSD: util.c,v 1.7 2002/02/16 21:27:38 millert Exp $ */
 /*	$NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */
 
 /*-
@@ -114,9 +114,9 @@ static const struct nameint kbdvar_tab[] = {
 	KB_VARTAB
 };
 
-char *int2name __P((int, int, const struct nameint *, int));
-int name2int __P((char *, const struct nameint *, int));
-void print_kmap __P((struct wskbd_map_data *));
+char *int2name(int, int, const struct nameint *, int);
+int name2int(char *, const struct nameint *, int);
+void print_kmap(struct wskbd_map_data *);
 
 struct field *
 field_by_name(field_tab, name)
diff --git a/sbin/wsconsctl/wsconsctl.c b/sbin/wsconsctl/wsconsctl.c
index 063ef3dbd3e..6dcd6333105 100644
--- a/sbin/wsconsctl/wsconsctl.c
+++ b/sbin/wsconsctl/wsconsctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsconsctl.c,v 1.9 2001/10/24 17:45:59 miod Exp $	*/
+/*	$OpenBSD: wsconsctl.c,v 1.10 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: wsconsctl.c,v 1.2 1998/12/29 22:40:20 hannken Exp $ */
 
 /*-
@@ -54,14 +54,14 @@ extern struct field keyboard_field_tab[];
 extern struct field mouse_field_tab[];
 extern struct field display_field_tab[];
 
-void usage __P((char *));
+void usage(char *);
 
 struct vartypesw {
 	const char *name, *file;
 	int fd;
 	struct field *field_tab;
-	void (*getval) __P((const char *pre, int));
-	void (*putval) __P((const char *pre, int));
+	void (*getval)(const char *pre, int);
+	void (*putval)(const char *pre, int);
 } typesw[] = {
 	{ "keyboard", PATH_KEYBOARD, -1, keyboard_field_tab,
 	  keyboard_get_values, keyboard_put_values },
@@ -72,7 +72,7 @@ struct vartypesw {
 	{ NULL }
 };
 
-struct vartypesw *tab_by_name __P((const char *));
+struct vartypesw *tab_by_name(const char *);
 
 void
 usage(msg)
diff --git a/sbin/wsconsctl/wsconsctl.h b/sbin/wsconsctl/wsconsctl.h
index ab639cbc184..4fa15e90b1b 100644
--- a/sbin/wsconsctl/wsconsctl.h
+++ b/sbin/wsconsctl/wsconsctl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsconsctl.h,v 1.3 2001/06/30 02:12:57 mickey Exp $	*/
+/*	$OpenBSD: wsconsctl.h,v 1.4 2002/02/16 21:27:38 millert Exp $	*/
 /*	$NetBSD: wsconsctl.h 1.1 1998/12/28 14:01:17 hannken Exp $ */
 
 /*-
@@ -59,20 +59,20 @@ struct field {
 	int flags;
 };
 
-struct field *field_by_name __P((struct field *, char *));
-struct field *field_by_value __P((struct field *, void *));
-void pr_field __P((const char *, struct field *, const char *));
-void rd_field __P((struct field *, char *, int));
-int name2ksym __P((char *));
-char *ksym2name __P((int));
-keysym_t ksym_upcase __P((keysym_t));
-void keyboard_get_values __P((const char *,int));
-void keyboard_put_values __P((const char *,int));
-void mouse_get_values __P((const char *,int));
-void mouse_put_values __P((const char *,int));
-void display_get_values __P((const char *,int));
-void display_put_values __P((const char *,int));
-int yyparse __P((void));
-void yyerror __P((char *));
-int yylex __P((void));
-void map_scan_setinput __P((char *));
+struct field *field_by_name(struct field *, char *);
+struct field *field_by_value(struct field *, void *);
+void pr_field(const char *, struct field *, const char *);
+void rd_field(struct field *, char *, int);
+int name2ksym(char *);
+char *ksym2name(int);
+keysym_t ksym_upcase(keysym_t);
+void keyboard_get_values(const char *,int);
+void keyboard_put_values(const char *,int);
+void mouse_get_values(const char *,int);
+void mouse_put_values(const char *,int);
+void display_get_values(const char *,int);
+void display_put_values(const char *,int);
+int yyparse(void);
+void yyerror(char *);
+int yylex(void);
+void map_scan_setinput(char *);