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.

248 files changed, 2403 insertions, 2402 deletions

diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index d71b7327e36..398576a421f 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ac.c,v 1.9 2001/05/24 03:02:32 pvalchev Exp $";
+static char rcsid[] = "$Id: ac.c,v 1.10 2002/02/16 21:28:00 millert Exp $";
 #endif
 
 #include <sys/types.h>
@@ -80,20 +80,20 @@ static struct tty_list *Ttys = NULL;
 static int Debug = 0;
 #endif
 
-int			main __P((int, char **));
-int			ac __P((FILE *));
-struct tty_list		*add_tty __P((char *));
-int			do_tty __P((char *));
-FILE			*file __P((char *));
-struct utmp_list	*log_in __P((struct utmp_list *, struct utmp *));
-struct utmp_list	*log_out __P((struct utmp_list *, struct utmp *));
-int			on_console __P((struct utmp_list *));
-void			show __P((char *, time_t));
+int			main(int, char **);
+int			ac(FILE *);
+struct tty_list		*add_tty(char *);
+int			do_tty(char *);
+FILE			*file(char *);
+struct utmp_list	*log_in(struct utmp_list *, struct utmp *);
+struct utmp_list	*log_out(struct utmp_list *, struct utmp *);
+int			on_console(struct utmp_list *);
+void			show(char *, time_t);
 void			show_today __P((struct user_list *, struct utmp_list *,
 			    time_t));
-void			show_users __P((struct user_list *));
-struct user_list	*update_user __P((struct user_list *, char *, time_t));
-void			usage __P((void));
+void			show_users(struct user_list *);
+struct user_list	*update_user(struct user_list *, char *, time_t);
+void			usage(void);
 
 /*
  * open wtmp or die
diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c
index f269fa4dcee..57a00dc03ea 100644
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.c
@@ -39,7 +39,7 @@ char copyright[] =
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)accton.c	4.3 (Berkeley) 6/1/90"; */
-static char *rcsid = "$Id: accton.c,v 1.4 1998/12/18 20:48:33 deraadt Exp $";
+static char *rcsid = "$Id: accton.c,v 1.5 2002/02/16 21:28:00 millert Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -49,7 +49,7 @@ static char *rcsid = "$Id: accton.c,v 1.4 1998/12/18 20:48:33 deraadt Exp $";
 #include <stdlib.h>
 #include <string.h>
 
-static void usage __P((void));
+static void usage(void);
 
 void
 usage()
diff --git a/usr.sbin/afs/src/lib/acl/acl.h b/usr.sbin/afs/src/lib/acl/acl.h
index 20e28a42b00..4a90b8abae2 100644
--- a/usr.sbin/afs/src/lib/acl/acl.h
+++ b/usr.sbin/afs/src/lib/acl/acl.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: acl.h,v 1.1 2000/09/11 14:40:54 art Exp $ */
+/* $Id: acl.h,v 1.2 2002/02/16 21:28:00 millert Exp $ */
 
 #ifndef __ACL_H
 #define __ACL_H
@@ -50,11 +50,11 @@
 #define __P(x) x
 #endif
 
-void acl_canonicalize_principal __P((char *principal, char *canon));
-int acl_initialize __P((char *acl_file, int perm));
-int acl_exact_match __P((char *acl, char *principal));
-int acl_check __P((char *acl, char *principal));
-int acl_add __P((char *acl, char *principal));
-int acl_delete __P((char *acl, char *principal));
+void acl_canonicalize_principal(char *principal, char *canon);
+int acl_initialize(char *acl_file, int perm);
+int acl_exact_match(char *acl, char *principal);
+int acl_check(char *acl, char *principal);
+int acl_add(char *acl, char *principal);
+int acl_delete(char *acl, char *principal);
 
 #endif /* __ACL_H */
diff --git a/usr.sbin/afs/src/rxkad/rxkad.h b/usr.sbin/afs/src/rxkad/rxkad.h
index 2f18b9d4fff..3ab7a79a693 100644
--- a/usr.sbin/afs/src/rxkad/rxkad.h
+++ b/usr.sbin/afs/src/rxkad/rxkad.h
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  */
 
-/* @(#)$Id: rxkad.h,v 1.2 2000/09/11 14:41:26 art Exp $ */
+/* @(#)$Id: rxkad.h,v 1.3 2002/02/16 21:28:00 millert Exp $ */
 
 #ifndef __RXKAD_H
 #define __RXKAD_H
@@ -137,11 +137,11 @@ struct ktc_principal {
   char cell[MAXKTCREALMLEN];
 };
 
-u_int32 life_to_time __P((u_int32 start, int life_));
+u_int32 life_to_time(u_int32 start, int life_);
 
-int time_to_life __P((u_int32 start, u_int32 end));
+int time_to_life(u_int32 start, u_int32 end);
 
-int tkt_CheckTimes __P((int32 begin, int32 end, int32 now));
+int tkt_CheckTimes(int32 begin, int32 end, int32 now);
 
 int
 tkt_MakeTicket __P((char *ticket,
diff --git a/usr.sbin/apmd/apm-proto.h b/usr.sbin/apmd/apm-proto.h
index 5d65c51bd32..74e74b16106 100644
--- a/usr.sbin/apmd/apm-proto.h
+++ b/usr.sbin/apmd/apm-proto.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apm-proto.h,v 1.2 2001/03/23 01:00:41 mickey Exp $	*/
+/*	$OpenBSD: apm-proto.h,v 1.3 2002/02/16 21:28:00 millert Exp $	*/
 
 /*
  *  Copyright (c) 1996 John T. Kohl
@@ -55,5 +55,5 @@ struct apm_reply {
 
 #define APMD_VNO	1
 
-extern const char *battstate __P((int state));
-extern const char *ac_state __P((int state));
+extern const char *battstate(int state);
+extern const char *ac_state(int state);
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 9d0af01f183..f8db75e98ad 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arp.c,v 1.18 2001/06/10 17:46:20 dugsong Exp $ */
+/*	$OpenBSD: arp.c,v 1.19 2002/02/16 21:28:00 millert Exp $ */
 /*	$NetBSD: arp.c,v 1.12 1995/04/24 13:25:18 cgd Exp $ */
 
 /*
@@ -45,7 +45,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)arp.c	8.2 (Berkeley) 1/2/94";*/
-static char *rcsid = "$OpenBSD: arp.c,v 1.18 2001/06/10 17:46:20 dugsong Exp $";
+static char *rcsid = "$OpenBSD: arp.c,v 1.19 2002/02/16 21:28:00 millert Exp $";
 #endif /* not lint */
 
 /*
@@ -75,21 +75,21 @@ static char *rcsid = "$OpenBSD: arp.c,v 1.18 2001/06/10 17:46:20 dugsong Exp $";
 #include <paths.h>
 #include <unistd.h>
 
-int delete __P((const char *, const char *));
+int delete(const char *, const char *);
 void search(in_addr_t addr, void (*action)(struct sockaddr_dl *sdl,
 	struct sockaddr_inarp *sin, struct rt_msghdr *rtm));
 void print_entry(struct sockaddr_dl *sdl,
 	struct sockaddr_inarp *sin, struct rt_msghdr *rtm);
 void nuke_entry(struct sockaddr_dl *sdl,
 	struct sockaddr_inarp *sin, struct rt_msghdr *rtm);
-void ether_print __P((const u_char *));
-int file __P((char *));
-int get __P((const char *));
-int getinetaddr __P((const char *, struct in_addr *));
-void getsocket __P((void));
-int rtmsg __P((int));
-int set __P((int, char **));
-void usage __P((void));
+void ether_print(const u_char *);
+int file(char *);
+int get(const char *);
+int getinetaddr(const char *, struct in_addr *);
+void getsocket(void);
+int rtmsg(int);
+int set(int, char **);
+void usage(void);
 
 static int pid;
 static int nflag;	/* no reverse dns lookups */
diff --git a/usr.sbin/bad144/bad144.c b/usr.sbin/bad144/bad144.c
index 6b538779fdd..6cfb72c56fd 100644
--- a/usr.sbin/bad144/bad144.c
+++ b/usr.sbin/bad144/bad144.c
@@ -39,7 +39,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)bad144.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: bad144.c,v 1.9 2001/08/12 12:03:03 heko Exp $";
+static char *rcsid = "$Id: bad144.c,v 1.10 2002/02/16 21:28:01 millert Exp $";
 #endif /* not lint */
 
 /*
@@ -83,14 +83,14 @@ daddr_t	size;
 struct	disklabel *dp;
 char	name[BUFSIZ];
 
-void	Perror __P((const char *));
-daddr_t	badsn __P((const struct bt_bad *));
-int	blkcopy __P((int, daddr_t, daddr_t));
-void	blkzero __P((int, daddr_t));
-int	checkold __P((void));
-int	compare __P((const void *, const void *));
-daddr_t	getold __P((int, struct dkbad *));
-void	shift __P((int, int, int));
+void	Perror(const char *);
+daddr_t	badsn(const struct bt_bad *);
+int	blkcopy(int, daddr_t, daddr_t);
+void	blkzero(int, daddr_t);
+int	checkold(void);
+int	compare(const void *, const void *);
+daddr_t	getold(int, struct dkbad *);
+void	shift(int, int, int);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/catman/catman.c b/usr.sbin/catman/catman.c
index cddaba6e16f..6c97940b47c 100644
--- a/usr.sbin/catman/catman.c
+++ b/usr.sbin/catman/catman.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: catman.c,v 1.2 1997/01/15 23:43:49 millert Exp $";
+static char rcsid[] = "$Id: catman.c,v 1.3 2002/02/16 21:28:01 millert Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -58,10 +58,10 @@ int dowhatis;
 char *mp = _PATH_MAN;
 char *sp = _MAN_SECTIONS;
 
-void usage __P((void));
-void catman __P((const char *, char *));
-void makewhatis __P((const char *));
-void dosystem __P((const char *));
+void usage(void);
+void catman(const char *, char *);
+void makewhatis(const char *);
+void dosystem(const char *);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/config/cmd.h b/usr.sbin/config/cmd.h
index 2f2d330e774..dc354b6e94c 100644
--- a/usr.sbin/config/cmd.h
+++ b/usr.sbin/config/cmd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.h,v 1.3 2001/08/12 12:03:03 heko Exp $	*/
+/*	$OpenBSD: cmd.h,v 1.4 2002/02/16 21:28:01 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -59,19 +59,19 @@ extern cmd_table_t cmd_table[];
 #endif
 
 /* Prototypes */
-int Xhelp __P((cmd_t *));
-int Xadd __P((cmd_t *));
-int Xbase __P((cmd_t *));
-int Xchange __P((cmd_t *));
-int Xdisable __P((cmd_t *));
-int Xenable __P((cmd_t *));
-int Xfind __P((cmd_t *));
-int Xlines __P((cmd_t *));
-int Xlist __P((cmd_t *));
-int Xshow __P((cmd_t *));
-int Xexit __P((cmd_t *));
-int Xquit __P((cmd_t *));
-int Xtimezone __P((cmd_t *));
+int Xhelp(cmd_t *);
+int Xadd(cmd_t *);
+int Xbase(cmd_t *);
+int Xchange(cmd_t *);
+int Xdisable(cmd_t *);
+int Xenable(cmd_t *);
+int Xfind(cmd_t *);
+int Xlines(cmd_t *);
+int Xlist(cmd_t *);
+int Xshow(cmd_t *);
+int Xexit(cmd_t *);
+int Xquit(cmd_t *);
+int Xtimezone(cmd_t *);
 
 #endif /* _CMD_H */
 
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index 426b15447f6..5017fdda174 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.h,v 1.15 2001/12/05 10:11:23 deraadt Exp $	*/
+/*	$OpenBSD: config.h,v 1.16 2002/02/16 21:28:01 millert Exp $	*/
 /*	$NetBSD: config.h,v 1.30 1997/02/02 21:12:30 thorpej Exp $	*/
 
 /*
@@ -328,65 +328,65 @@ struct {			/* loc[] table for config */
 } locators;
 
 /* files.c */
-void	initfiles __P((void));
-void	checkfiles __P((void));
-int	fixfiles __P((void));	/* finalize */
-int	fixobjects __P((void));
-void	addfile __P((const char *, struct nvlist *, int, const char *));
-void	addobject __P((const char *, struct nvlist *, int));
+void	initfiles(void);
+void	checkfiles(void);
+int	fixfiles(void);		/* finalize */
+int	fixobjects(void);
+void	addfile(const char *, struct nvlist *, int, const char *);
+void	addobject(const char *, struct nvlist *, int);
 
 /* hash.c */
-struct	hashtab *ht_new __P((void));
-int	ht_insrep __P((struct hashtab *, const char *, void *, int));
-int     ht_remove __P((struct hashtab *, const char *));
+struct	hashtab *ht_new(void);
+int	ht_insrep(struct hashtab *, const char *, void *, int);
+int     ht_remove(struct hashtab *, const char *);
 #define	ht_insert(ht, nam, val) ht_insrep(ht, nam, val, 0)
 #define	ht_replace(ht, nam, val) ht_insrep(ht, nam, val, 1)
-void	*ht_lookup __P((struct hashtab *, const char *));
-void	initintern __P((void));
-const char *intern __P((const char *));
+void	*ht_lookup(struct hashtab *, const char *);
+void	initintern(void);
+const char *intern(const char *);
 
 /* main.c */
-void	addoption __P((const char *name, const char *value));
-void	removeoption __P((const char *name));
-void	addmkoption __P((const char *name, const char *value));
-void	defoption __P((const char *name));
-int	devbase_has_instances __P((struct devbase *, int));
-int	deva_has_instances __P((struct deva *, int));
-void	setupdirs __P((void));
+void	addoption(const char *name, const char *value);
+void	removeoption(const char *name);
+void	addmkoption(const char *name, const char *value);
+void	defoption(const char *name);
+int	devbase_has_instances(struct devbase *, int);
+int	deva_has_instances(struct deva *, int);
+void	setupdirs(void);
 
 /* mkheaders.c */
-int	mkheaders __P((void));
+int	mkheaders(void);
 
 /* mkioconf.c */
-int	mkioconf __P((void));
+int	mkioconf(void);
 
 /* mkmakefile.c */
-int	mkmakefile __P((void));
+int	mkmakefile(void);
 
 /* mkswap.c */
-int	mkswap __P((void));
+int	mkswap(void);
 
 /* pack.c */
-void	pack __P((void));
+void	pack(void);
 
 /* scan.l */
-int	currentline __P((void));
-int	firstfile __P((const char *));
-int	include __P((const char *, int));
+int	currentline(void);
+int	firstfile(const char *);
+int	include(const char *, int);
 
 /* sem.c, other than for yacc actions */
-void	initsem __P((void));
+void	initsem(void);
 
 /* util.c */
-void	*emalloc __P((size_t));
-void	*erealloc __P((void *, size_t));
-char	*sourcepath __P((const char *));
-void	error __P((const char *, ...));			/* immediate errs */
-void	xerror __P((const char *, int, const char *, ...)); /* delayed errs */
-__dead void panic __P((const char *, ...));
+void	*emalloc(size_t);
+void	*erealloc(void *, size_t);
+char	*sourcepath(const char *);
+void	error(const char *, ...);			/* immediate errs */
+void	xerror(const char *, int, const char *, ...);	/* delayed errs */
+__dead void panic(const char *, ...);
 struct nvlist *newnv __P((const char *, const char *, void *, int,
 	    struct nvlist *));
-void	nvfree __P((struct nvlist *));
-void	nvfreel __P((struct nvlist *));
+void	nvfree(struct nvlist *);
+void	nvfreel(struct nvlist *);
 
-int	ukc __P((char *, char *, int, int));
+int	ukc(char *, char *, int, int);
diff --git a/usr.sbin/config/exec.c b/usr.sbin/config/exec.c
index ece46bc69ab..5549c5d4b81 100644
--- a/usr.sbin/config/exec.c
+++ b/usr.sbin/config/exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.c,v 1.2 2001/12/05 10:11:23 deraadt Exp $ */
+/*	$OpenBSD: exec.c,v 1.3 2002/02/16 21:28:01 millert Exp $ */
 
 /*
  * Copyright (c) 1999 Mats O Jansson.  All rights reserved.
@@ -34,31 +34,31 @@
 #include <stdio.h>
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: exec.c,v 1.2 2001/12/05 10:11:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: exec.c,v 1.3 2002/02/16 21:28:01 millert Exp $";
 #endif
 
 #ifdef AOUT_SUPPORT
-int	aout_check __P((char *));
-void	aout_loadkernel __P((char *));
-void	aout_savekernel __P((char *));
-caddr_t	aout_adjust __P((caddr_t));
-caddr_t	aout_readjust __P((caddr_t));
+int	aout_check(char *);
+void	aout_loadkernel(char *);
+void	aout_savekernel(char *);
+caddr_t	aout_adjust(caddr_t);
+caddr_t	aout_readjust(caddr_t);
 #endif
 
 #ifdef ECOFF_SUPPORT
-int	ecoff_check __P((char *));
-void	ecoff_loadkernel __P((char *));
-void	ecoff_savekernel __P((char *));
-caddr_t	ecoff_adjust __P((caddr_t));
-caddr_t	ecoff_readjust __P((caddr_t));
+int	ecoff_check(char *);
+void	ecoff_loadkernel(char *);
+void	ecoff_savekernel(char *);
+caddr_t	ecoff_adjust(caddr_t);
+caddr_t	ecoff_readjust(caddr_t);
 #endif
 
 #ifdef ELF_SUPPORT
-int	elf_check __P((char *));
-void	elf_loadkernel __P((char *));
-void	elf_savekernel __P((char *));
-caddr_t	elf_adjust __P((caddr_t));
-caddr_t	elf_readjust __P((caddr_t));
+int	elf_check(char *);
+void	elf_loadkernel(char *);
+void	elf_savekernel(char *);
+caddr_t	elf_adjust(caddr_t);
+caddr_t	elf_readjust(caddr_t);
 #endif
 
 #define DO_AOUT	0
diff --git a/usr.sbin/config/exec.h b/usr.sbin/config/exec.h
index 93420676721..9ced4ae761c 100644
--- a/usr.sbin/config/exec.h
+++ b/usr.sbin/config/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.2 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: exec.h,v 1.3 2002/02/16 21:28:01 millert Exp $ */
 
 /*
  * Copyright (c) 1999 Mats O Jansson.  All rights reserved.
@@ -32,10 +32,10 @@
 #ifndef _EXEC_H
 #define _EXEC_H
 
-void	loadkernel __P((char *));
-void	savekernel __P((char *));
-caddr_t	adjust __P((caddr_t));
-caddr_t	readjust __P((caddr_t));
+void	loadkernel(char *);
+void	savekernel(char *);
+caddr_t	adjust(caddr_t);
+caddr_t	readjust(caddr_t);
 
 #endif /* _EXEC_H */
 
diff --git a/usr.sbin/config/files.c b/usr.sbin/config/files.c
index 84eeadcec53..4245d2fe5b9 100644
--- a/usr.sbin/config/files.c
+++ b/usr.sbin/config/files.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: files.c,v 1.8 2001/12/05 10:11:23 deraadt Exp $	*/
+/*	$OpenBSD: files.c,v 1.9 2002/02/16 21:28:01 millert Exp $	*/
 /*	$NetBSD: files.c,v 1.6 1996/03/17 13:18:17 cgd Exp $	*/
 
 /*
@@ -68,13 +68,13 @@ static struct files **unchecked;
 
 static struct objects **nextobject;
 
-static int	checkaux __P((const char *, void *));
-static int	fixcount __P((const char *, void *));
-static int	fixfsel __P((const char *, void *));
-static int	fixsel __P((const char *, void *));
+static int	checkaux(const char *, void *);
+static int	fixcount(const char *, void *);
+static int	fixfsel(const char *, void *);
+static int	fixsel(const char *, void *);
 static int	expr_eval __P((struct nvlist *,
 		    int (*)(const char *, void *), void *));
-static void	expr_free __P((struct nvlist *));
+static void	expr_free(struct nvlist *);
 
 void
 initfiles()
@@ -392,7 +392,7 @@ fixsel(name, context)
 static int
 expr_eval(expr, fn, context)
 	register struct nvlist *expr;
-	register int (*fn) __P((const char *, void *));
+	register int (*fn)(const char *, void *);
 	register void *context;
 {
 	int lhs, rhs;
diff --git a/usr.sbin/config/gram.y b/usr.sbin/config/gram.y
index 1012d32d596..f616ff61936 100644
--- a/usr.sbin/config/gram.y
+++ b/usr.sbin/config/gram.y
@@ -1,5 +1,5 @@
 %{
-/*	$OpenBSD: gram.y,v 1.11 2001/01/23 06:02:58 angelos Exp $	*/
+/*	$OpenBSD: gram.y,v 1.12 2002/02/16 21:28:01 millert Exp $	*/
 /*	$NetBSD: gram.y,v 1.14 1997/02/02 21:12:32 thorpej Exp $	*/
 
 /*
@@ -60,9 +60,9 @@
 
 #define	stop(s)	error(s), exit(1)
 
-int	include __P((const char *, int));
-void	yyerror __P((const char *));
-int	yylex __P((void));
+int	include(const char *, int);
+void	yyerror(const char *);
+int	yylex(void);
 
 static	struct	config conf;	/* at most one active at a time */
 
@@ -85,9 +85,9 @@ static	int	adepth;
 #define	fx_and(e1, e2)	new0(NULL, NULL, e1, FX_AND, e2)
 #define	fx_or(e1, e2)	new0(NULL, NULL, e1, FX_OR, e2)
 
-static	void	cleanup __P((void));
-static	void	setmachine __P((const char *, const char *));
-static	void	check_maxpart __P((void));
+static	void	cleanup(void);
+static	void	setmachine(const char *, const char *);
+static	void	check_maxpart(void);
 
 %}
 
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 947d8d1bb64..03a0e2acc22 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.22 2001/12/11 23:47:00 miod Exp $	*/
+/*	$OpenBSD: main.c,v 1.23 2002/02/16 21:28:01 millert Exp $	*/
 /*	$NetBSD: main.c,v 1.22 1997/02/02 21:12:33 thorpej Exp $	*/
 
 /*
@@ -62,8 +62,8 @@ static char copyright[] =
 #include <unistd.h>
 #include "config.h"
 
-int	firstfile __P((const char *));
-int	yyparse __P((void));
+int	firstfile(const char *);
+int	yyparse(void);
 
 extern char *optarg;
 extern int optind;
@@ -73,15 +73,15 @@ static struct nvlist **nextopt;
 static struct nvlist **nextdefopt;
 static struct nvlist **nextmkopt;
 
-static __dead void stop __P((void));
+static __dead void stop(void);
 static int do_option __P((struct hashtab *, struct nvlist ***,
 			const char *, const char *, const char *));
-static int crosscheck __P((void));
-static int badstar __P((void));
-static int mksymlinks __P((void));
-static int hasparent __P((struct devi *));
-static int cfcrosscheck __P((struct config *, const char *, struct nvlist *));
-static void optiondelta __P((void));
+static int crosscheck(void);
+static int badstar(void);
+static int mksymlinks(void);
+static int hasparent(struct devi *);
+static int cfcrosscheck(struct config *, const char *, struct nvlist *);
+static void optiondelta(void);
 
 int	madedir = 0;
 
diff --git a/usr.sbin/config/misc.h b/usr.sbin/config/misc.h
index 503d6126f19..a5f5939eb78 100644
--- a/usr.sbin/config/misc.h
+++ b/usr.sbin/config/misc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.h,v 1.2 2001/08/12 12:03:03 heko Exp $	*/
+/*	$OpenBSD: misc.h,v 1.3 2002/02/16 21:28:01 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -37,8 +37,8 @@
 #include "cmd.h"
 
 /* Prototypes */
-int ask_cmd __P((cmd_t *));
-int ask_yn __P((const char *));
+int ask_cmd(cmd_t *);
+int ask_yn(const char *);
 
 #endif /* _MISC_H */
 
diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c
index dc4ed3f9f38..4b383e4a03a 100644
--- a/usr.sbin/config/mkheaders.c
+++ b/usr.sbin/config/mkheaders.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkheaders.c,v 1.10 1998/05/14 21:16:44 deraadt Exp $	*/
+/*	$OpenBSD: mkheaders.c,v 1.11 2002/02/16 21:28:01 millert Exp $	*/
 /*	$NetBSD: mkheaders.c,v 1.12 1997/02/02 21:12:34 thorpej Exp $	*/
 
 /*
@@ -53,10 +53,10 @@
 #include <string.h>
 #include "config.h"
 
-static int emitcnt __P((struct nvlist *));
-static int emitopt __P((struct nvlist *));
-static int err __P((const char *, char *, FILE *));
-static char *cntname __P((const char *));
+static int emitcnt(struct nvlist *);
+static int emitopt(struct nvlist *);
+static int err(const char *, char *, FILE *);
+static char *cntname(const char *);
 
 /*
  * Make headers containing counts, as needed.
diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c
index 890deac0333..ad08c5174e8 100644
--- a/usr.sbin/config/mkioconf.c
+++ b/usr.sbin/config/mkioconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkioconf.c,v 1.17 2001/11/10 20:46:07 maja Exp $	*/
+/*	$OpenBSD: mkioconf.c,v 1.18 2002/02/16 21:28:01 millert Exp $	*/
 /*	$NetBSD: mkioconf.c,v 1.41 1996/11/11 14:18:49 mycroft Exp $	*/
 
 /*
@@ -55,15 +55,15 @@
 /*
  * Make ioconf.c.
  */
-static int cforder __P((const void *, const void *));
-static int emitcfdata __P((FILE *));
-static int emitexterns __P((FILE *));
-static int emithdr __P((FILE *));
-static int emitloc __P((FILE *));
-static int emitlocnames __P((FILE *));
-static int emitpseudo __P((FILE *));
-static int emitpv __P((FILE *));
-static int emitroots __P((FILE *));
+static int cforder(const void *, const void *);
+static int emitcfdata(FILE *);
+static int emitexterns(FILE *);
+static int emithdr(FILE *);
+static int emitloc(FILE *);
+static int emitlocnames(FILE *);
+static int emitpseudo(FILE *);
+static int emitpv(FILE *);
+static int emitroots(FILE *);
 
 #define	SEP(pos, max)	(((u_int)(pos) % (max)) == 0 ? "\n\t" : " ")
 
@@ -469,7 +469,7 @@ emitpseudo(fp)
 	if (fputs("\n/* pseudo-devices */\n", fp) < 0)
 		return (1);
 	for (i = allpseudo; i != NULL; i = i->i_next)
-		if (fprintf(fp, "extern void %sattach __P((int));\n",
+		if (fprintf(fp, "extern void %sattach(int);\n",
 		    i->i_base->d_name) < 0)
 			return (1);
 	if (fputs("\nchar *pdevnames[] = {\n", fp) < 0)
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index 962ea278548..1e6ea16bb0a 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkmakefile.c,v 1.9 2001/12/05 10:11:23 deraadt Exp $	*/
+/*	$OpenBSD: mkmakefile.c,v 1.10 2002/02/16 21:28:01 millert Exp $	*/
 /*	$NetBSD: mkmakefile.c,v 1.34 1997/02/02 21:12:36 thorpej Exp $	*/
 
 /*
@@ -58,23 +58,23 @@
  * Make the Makefile.
  */
 
-static const char *srcpath __P((struct files *));
+static const char *srcpath(struct files *);
 
-static int emitdefs __P((FILE *));
-static int emitfiles __P((FILE *, int));
+static int emitdefs(FILE *);
+static int emitfiles(FILE *, int);
 
-static int emitobjs __P((FILE *));
-static int emitcfiles __P((FILE *));
-static int emitsfiles __P((FILE *));
-static int emitrules __P((FILE *));
-static int emitload __P((FILE *));
+static int emitobjs(FILE *);
+static int emitcfiles(FILE *);
+static int emitsfiles(FILE *);
+static int emitrules(FILE *);
+static int emitload(FILE *);
 
 int
 mkmakefile()
 {
 	register FILE *ifp, *ofp;
 	register int lineno;
-	register int (*fn) __P((FILE *));
+	register int (*fn)(FILE *);
 	register char *ifname;
 	char line[BUFSIZ], buf[200];
 
diff --git a/usr.sbin/config/mkswap.c b/usr.sbin/config/mkswap.c
index 57d58a6b19b..7b7367858d4 100644
--- a/usr.sbin/config/mkswap.c
+++ b/usr.sbin/config/mkswap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkswap.c,v 1.7 1996/11/12 08:37:58 niklas Exp $	*/
+/*	$OpenBSD: mkswap.c,v 1.8 2002/02/16 21:28:01 millert Exp $	*/
 /*	$NetBSD: mkswap.c,v 1.5 1996/08/31 20:58:27 mycroft Exp $	*/
 
 /*
@@ -53,7 +53,7 @@
 #include "config.h"
 #include "sem.h"
 
-static int mkoneswap __P((struct config *));
+static int mkoneswap(struct config *);
 
 /*
  * Make the various swap*.c files.  Nothing to do for generic swap.
@@ -120,7 +120,7 @@ mkoneswap(cf)
 		goto wrerror;
 	mountroot =
 	    cf->cf_root->nv_str == s_nfs ? "nfs_mountroot" : "dk_mountroot";
-	if (fprintf(fp, "int (*mountroot) __P((void)) = %s;\n", mountroot) < 0)
+	if (fprintf(fp, "int (*mountroot)(void) = %s;\n", mountroot) < 0)
 		goto wrerror;
 
 	if (fclose(fp)) {
diff --git a/usr.sbin/config/pack.c b/usr.sbin/config/pack.c
index 8cc8659ff5a..cf589f93143 100644
--- a/usr.sbin/config/pack.c
+++ b/usr.sbin/config/pack.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pack.c,v 1.9 1999/01/19 01:11:25 niklas Exp $	*/
+/*	$OpenBSD: pack.c,v 1.10 2002/02/16 21:28:01 millert Exp $	*/
 /*	$NetBSD: pack.c,v 1.5 1996/08/31 21:15:11 mycroft Exp $	*/
 
 /*
@@ -88,7 +88,7 @@
  * (So it goes.)
  */
 
-typedef int (*vec_cmp_func) __P((const void *, int, int));
+typedef int (*vec_cmp_func)(const void *, int, int);
 
 #define	TAILHSIZE	128
 #define	PVHASH(i)	((i) & (TAILHSIZE - 1))
@@ -103,21 +103,21 @@ static int locspace;
 static int pvecspace;
 static int longest_pvec;
 
-static void packdevi __P((void));
-static void packlocs __P((void));
-static void packpvec __P((void));
-
-static void addparents __P((struct devi *src, struct devi *dst));
-static int nparents __P((struct devi **, struct devbase *, int));
-static int sameas __P((struct devi *, struct devi *));
-static int findvec __P((const void *, int, int, vec_cmp_func, int));
-static int samelocs __P((const void *, int, int));
-static int addlocs __P((const char **, int));
-static int loclencmp __P((const void *, const void *));
-static int samepv __P((const void *, int, int));
-static int addpv __P((short *, int));
-static int pvlencmp __P((const void *, const void *));
-static void resettails __P((void));
+static void packdevi(void);
+static void packlocs(void);
+static void packpvec(void);
+
+static void addparents(struct devi *src, struct devi *dst);
+static int nparents(struct devi **, struct devbase *, int);
+static int sameas(struct devi *, struct devi *);
+static int findvec(const void *, int, int, vec_cmp_func, int);
+static int samelocs(const void *, int, int);
+static int addlocs(const char **, int);
+static int loclencmp(const void *, const void *);
+static int samepv(const void *, int, int);
+static int addpv(short *, int);
+static int pvlencmp(const void *, const void *);
+static void resettails(void);
 
 void
 pack()
diff --git a/usr.sbin/config/scan.l b/usr.sbin/config/scan.l
index 739e8022cb0..7d55ef8c504 100644
--- a/usr.sbin/config/scan.l
+++ b/usr.sbin/config/scan.l
@@ -1,5 +1,5 @@
 %{
-/*	$OpenBSD: scan.l,v 1.14 2001/01/23 06:02:59 angelos Exp $	*/
+/*	$OpenBSD: scan.l,v 1.15 2002/02/16 21:28:01 millert Exp $	*/
 /*	$NetBSD: scan.l,v 1.13 1997/02/02 21:12:37 thorpej Exp $	*/
 
 /*
@@ -70,7 +70,7 @@ struct incl {
 	int	in_ateof;	/* token to insert at EOF */
 };
 static struct incl *incl;
-static int endinclude __P((void));
+static int endinclude(void);
 
 #define	yywrap() 1
 
diff --git a/usr.sbin/config/sem.c b/usr.sbin/config/sem.c
index 8e23e9b0d58..2abf276e3b9 100644
--- a/usr.sbin/config/sem.c
+++ b/usr.sbin/config/sem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sem.c,v 1.22 2001/12/05 10:11:23 deraadt Exp $	*/
+/*	$OpenBSD: sem.c,v 1.23 2002/02/16 21:28:01 millert Exp $	*/
 /*	$NetBSD: sem.c,v 1.10 1996/11/11 23:40:11 gwr Exp $	*/
 
 /*
@@ -77,21 +77,21 @@ static struct config **nextcf;
 static struct devi **nextdevi;
 static struct devi **nextpseudo;
 
-static int has_errobj __P((struct nvlist *, void *));
-static struct nvlist *addtoattr __P((struct nvlist *, struct devbase *));
-static int exclude __P((struct nvlist *, const char *, const char *));
+static int has_errobj(struct nvlist *, void *);
+static struct nvlist *addtoattr(struct nvlist *, struct devbase *);
+static int exclude(struct nvlist *, const char *, const char *);
 static int resolve __P((struct nvlist **, const char *, const char *,
 			struct nvlist *, int));
 static int lresolve __P((struct nvlist **, const char *, const char *,
 			struct nvlist *, int));
-static struct devi *newdevi __P((const char *, int, struct devbase *d));
-static struct devi *getdevi __P((const char *));
-static const char *concat __P((const char *, int));
-static char *extend __P((char *, const char *));
-static int split __P((const char *, size_t, char *, size_t, int *));
-static void selectbase __P((struct devbase *, struct deva *));
-static int onlist __P((struct nvlist *, void *));
-static const char **fixloc __P((const char *, struct attr *, struct nvlist *));
+static struct devi *newdevi(const char *, int, struct devbase *d);
+static struct devi *getdevi(const char *);
+static const char *concat(const char *, int);
+static char *extend(char *, const char *);
+static int split(const char *, size_t, char *, size_t, int *);
+static void selectbase(struct devbase *, struct deva *);
+static int onlist(struct nvlist *, void *);
+static const char **fixloc(const char *, struct attr *, struct nvlist *);
 
 void
 initsem()
diff --git a/usr.sbin/config/sem.h b/usr.sbin/config/sem.h
index 2e6ab44ee59..89dfa079738 100644
--- a/usr.sbin/config/sem.h
+++ b/usr.sbin/config/sem.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sem.h,v 1.8 2001/01/23 17:43:21 deraadt Exp $	*/
+/*	$OpenBSD: sem.h,v 1.9 2002/02/16 21:28:01 millert Exp $	*/
 /*	$NetBSD: sem.h,v 1.6 1996/11/11 23:40:10 gwr Exp $	*/
 
 /*
@@ -45,27 +45,27 @@
  *	from: @(#)sem.h	8.1 (Berkeley) 6/6/93
  */
 
-void		enddefs __P((void));
+void		enddefs(void);
 
-void		setdefmaxusers __P((int, int, int));
-void		setmaxusers __P((int));
-int		defattr __P((const char *, struct nvlist *));
+void		setdefmaxusers(int, int, int);
+void		setmaxusers(int);
+int		defattr(const char *, struct nvlist *);
 void		defdev __P((struct devbase *, int, struct nvlist *,
 			struct nvlist *));
 void		defdevattach __P((struct deva *, struct devbase *,
 			struct nvlist *, struct nvlist *));
-struct devbase *getdevbase __P((const char *name));
-struct deva    *getdevattach __P((const char *name));
-struct attr    *getattr __P((const char *name));
-void		setmajor __P((struct devbase *d, int n));
-void		addconf __P((struct config *));
-void		setconf __P((struct nvlist **, const char *, struct nvlist *));
-void		adddev __P((const char *, const char *, struct nvlist *, int, int));
-void		enabledev __P((const char *, const char *));
-void		addpseudo __P((const char *name, int number));
-const char     *ref __P((const char *name));
-const char     *starref __P((const char *name));
-const char     *wildref __P((const char *name));
+struct devbase *getdevbase(const char *name);
+struct deva    *getdevattach(const char *name);
+struct attr    *getattr(const char *name);
+void		setmajor(struct devbase *d, int n);
+void		addconf(struct config *);
+void		setconf(struct nvlist **, const char *, struct nvlist *);
+void		adddev(const char *, const char *, struct nvlist *, int, int);
+void		enabledev(const char *, const char *);
+void		addpseudo(const char *name, int number);
+const char     *ref(const char *name);
+const char     *starref(const char *name);
+const char     *wildref(const char *name);
 
 extern const char *s_generic;
 extern const char *s_nfs;
diff --git a/usr.sbin/config/ukc.c b/usr.sbin/config/ukc.c
index 8e70d42fe5e..8d0db1cdb97 100644
--- a/usr.sbin/config/ukc.c
+++ b/usr.sbin/config/ukc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ukc.c,v 1.6 2001/12/05 10:11:23 deraadt Exp $ */
+/*	$OpenBSD: ukc.c,v 1.7 2002/02/16 21:28:01 millert Exp $ */
 
 /*
  * Copyright (c) 1999-2001 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: ukc.c,v 1.6 2001/12/05 10:11:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ukc.c,v 1.7 2002/02/16 21:28:01 millert Exp $";
 #endif
 
 #include <sys/types.h>
@@ -51,8 +51,8 @@ static char rcsid[] = "$OpenBSD: ukc.c,v 1.6 2001/12/05 10:11:23 deraadt Exp $";
 #include "ukc.h"
 #include "exec.h"
 
-void	init __P((void));
-void	usage __P((void));
+void	init(void);
+void	usage(void);
 
 int	ukc_mod_kernel = 0;
 
diff --git a/usr.sbin/config/ukc.h b/usr.sbin/config/ukc.h
index 7745e9fe742..ef82f1e5501 100644
--- a/usr.sbin/config/ukc.h
+++ b/usr.sbin/config/ukc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ukc.h,v 1.6 2001/12/05 10:11:23 deraadt Exp $ */
+/*	$OpenBSD: ukc.h,v 1.7 2002/02/16 21:28:01 millert Exp $ */
 
 /*
  * Copyright (c) 1999-2001 Mats O Jansson.  All rights reserved.
@@ -117,34 +117,34 @@ extern int oldkernel;
 extern int nopdev;
 #endif
 
-struct cfdata   *get_cfdata __P((int));
-short	        *get_locnamp __P((int));
-caddr_t	        *get_locnames __P((int));
-int	        *get_extraloc __P((int));
-char	        *get_pdevnames __P((int));
-struct pdevinit *get_pdevinit __P((int));
+struct cfdata   *get_cfdata(int);
+short	        *get_locnamp(int);
+caddr_t	        *get_locnames(int);
+int	        *get_extraloc(int);
+char	        *get_pdevnames(int);
+struct pdevinit *get_pdevinit(int);
 
-int	more __P(());
-void	pnum __P((int));
-void	pdevnam __P((short));
-void	pdev __P((short));
-int	number __P((char *, int *));
-int	device __P((char *, int *, short *, short *));
-int	attr __P((char *, int *));
-void	modify __P((char *, int *));
-void	change __P((int));
-void	disable __P((int));
-void	enable __P((int));
-void	show __P((void));
-void	common_attr_val __P((short, int *, char));
-void	show_attr __P((char *));
-void	common_dev __P((char *, int, short, short, char));
-void	common_attr __P((char *, int, char));
-void	add_read __P((char *, char, char *, int, int *));
-void	add __P((char *, int, short, short));
+int	more();
+void	pnum(int);
+void	pdevnam(short);
+void	pdev(short);
+int	number(char *, int *);
+int	device(char *, int *, short *, short *);
+int	attr(char *, int *);
+void	modify(char *, int *);
+void	change(int);
+void	disable(int);
+void	enable(int);
+void	show(void);
+void	common_attr_val(short, int *, char);
+void	show_attr(char *);
+void	common_dev(char *, int, short, short, char);
+void	common_attr(char *, int, char);
+void	add_read(char *, char, char *, int, int *);
+void	add(char *, int, short, short);
 
-int	config __P(());
-void	process_history __P((int, char *));
+int	config();
+void	process_history(int, char *);
 
 #define UC_CHANGE 'c'
 #define UC_DISABLE 'd'
diff --git a/usr.sbin/config/util.c b/usr.sbin/config/util.c
index b470ac4c8dd..699ae2acfba 100644
--- a/usr.sbin/config/util.c
+++ b/usr.sbin/config/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.6 1997/07/25 20:12:10 mickey Exp $	*/
+/*	$OpenBSD: util.c,v 1.7 2002/02/16 21:28:01 millert Exp $	*/
 /*	$NetBSD: util.c,v 1.5 1996/08/31 20:58:29 mycroft Exp $	*/
 
 /*
@@ -57,8 +57,8 @@
 #include <sys/types.h>
 #include "config.h"
 
-static void nomem __P((void));
-static void vxerror __P((const char *, int, const char *, va_list));
+static void nomem(void);
+static void vxerror(const char *, int, const char *, va_list);
 
 /*
  * Malloc, with abort on error.
diff --git a/usr.sbin/cron/cron.c b/usr.sbin/cron/cron.c
index 07b1075bdaf..fb3f44cd202 100644
--- a/usr.sbin/cron/cron.c
+++ b/usr.sbin/cron/cron.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cron.c,v 1.18 2001/12/20 23:27:47 millert Exp $	*/
+/*	$OpenBSD: cron.c,v 1.19 2002/02/16 21:28:01 millert Exp $	*/
 /* Copyright 1988,1990,1993,1994 by Paul Vixie
  * All rights reserved
  */
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(LINT)
-static char rcsid[] = "$OpenBSD: cron.c,v 1.18 2001/12/20 23:27:47 millert Exp $";
+static char rcsid[] = "$OpenBSD: cron.c,v 1.19 2002/02/16 21:28:01 millert Exp $";
 #endif
 
 #define	MAIN_PROGRAM
@@ -30,9 +30,9 @@ static char rcsid[] = "$OpenBSD: cron.c,v 1.18 2001/12/20 23:27:47 millert Exp $
 
 static	void	usage(void),
 		run_reboot_jobs(cron_db *),
-		find_jobs __P((int, cron_db *, int, int)),
-		set_time __P((int)),
-		cron_sleep __P((int)),
+		find_jobs(int, cron_db *, int, int),
+		set_time(int),
+		cron_sleep(int),
 		sigchld_handler(int),
 		sighup_handler(int),
 		sigusr1_handler(int),
diff --git a/usr.sbin/cron/crontab.c b/usr.sbin/cron/crontab.c
index 2fae5876d30..9ed216e139d 100644
--- a/usr.sbin/cron/crontab.c
+++ b/usr.sbin/cron/crontab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crontab.c,v 1.26 2001/12/20 23:27:47 millert Exp $	*/
+/*	$OpenBSD: crontab.c,v 1.27 2002/02/16 21:28:01 millert Exp $	*/
 /* Copyright 1988,1990,1993,1994 by Paul Vixie
  * All rights reserved
  */
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(LINT)
-static char rcsid[] = "$OpenBSD: crontab.c,v 1.26 2001/12/20 23:27:47 millert Exp $";
+static char rcsid[] = "$OpenBSD: crontab.c,v 1.27 2002/02/16 21:28:01 millert Exp $";
 #endif
 
 /* crontab - install and manage per-user crontab files
@@ -58,7 +58,7 @@ static	void		list_cmd(void),
 			check_error(const char *),
 			parse_args(int c, char *v[]);
 static	int		replace_cmd(void);
-static	void		clean_turds __P((int));
+static	void		clean_turds(int);
 
 static void
 usage(const char *msg) {
diff --git a/usr.sbin/cron/funcs.h b/usr.sbin/cron/funcs.h
index 96828b63461..680f1301ca6 100644
--- a/usr.sbin/cron/funcs.h
+++ b/usr.sbin/cron/funcs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: funcs.h,v 1.3 2001/02/20 02:03:19 millert Exp $	*/
+/*	$OpenBSD: funcs.h,v 1.4 2002/02/16 21:28:01 millert Exp $	*/
 
 /*
  * Copyright (c) 1997,2000 by Internet Software Consortium, Inc.
@@ -45,7 +45,7 @@ int		job_runqueue(void),
 		get_char(FILE *),
 		get_string(char *, int, FILE *, char *),
 		swap_uids(void),
-		swap_uids_back __P((void)),
+		swap_uids_back(void),
 		load_env(char *, FILE *),
 		cron_pclose(FILE *),
 		glue_strings(char *, int, char *, char *, int),
diff --git a/usr.sbin/dev_mkdb/dev_mkdb.c b/usr.sbin/dev_mkdb/dev_mkdb.c
index 18469377ec9..09108830f65 100644
--- a/usr.sbin/dev_mkdb/dev_mkdb.c
+++ b/usr.sbin/dev_mkdb/dev_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_mkdb.c,v 1.5 2000/10/03 18:07:51 mickey Exp $	*/
+/*	$OpenBSD: dev_mkdb.c,v 1.6 2002/02/16 21:28:01 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)dev_mkdb.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$Id: dev_mkdb.c,v 1.5 2000/10/03 18:07:51 mickey Exp $";
+static char rcsid[] = "$Id: dev_mkdb.c,v 1.6 2002/02/16 21:28:01 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -60,7 +60,7 @@ static char rcsid[] = "$Id: dev_mkdb.c,v 1.5 2000/10/03 18:07:51 mickey Exp $";
 #include <string.h>
 #include <unistd.h>
 
-void	usage __P((void));
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index 64de9f771d3..98bbe23c108 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -42,7 +42,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)edquota.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: edquota.c,v 1.28 2001/09/04 23:35:59 millert Exp $";
+static char *rcsid = "$Id: edquota.c,v 1.29 2002/02/16 21:28:01 millert Exp $";
 #endif /* not lint */
 
 /*
@@ -77,24 +77,24 @@ struct quotause {
 	struct	dqblk dqblk;
 	char	fsname[MAXPATHLEN];
 	char	qfname[1];	/* actually longer */
-} *getprivs __P((u_int, int));
+} *getprivs(u_int, int);
 #define	FOUND	0x01
 
-void	usage __P((void));
-int	getentry __P((char *, int, u_int *));
+void	usage(void);
+int	getentry(char *, int, u_int *);
 struct quotause *
-	getprivs __P((u_int, int));
-void	putprivs __P((long, int, struct quotause *));
-int	editit __P((char *));
-int	writeprivs __P((struct quotause *, int, char *, int));
-int	readprivs __P((struct quotause *, int));
-int	writetimes __P((struct quotause *, int, int));
-int	readtimes __P((struct quotause *, int));
-char *	cvtstoa __P((time_t));
-int	cvtatos __P((time_t, char *, time_t *));
-void	freeprivs __P((struct quotause *));
-int	alldigits __P((char *s));
-int	hasquota __P((struct fstab *, int, char **));
+	getprivs(u_int, int);
+void	putprivs(long, int, struct quotause *);
+int	editit(char *);
+int	writeprivs(struct quotause *, int, char *, int);
+int	readprivs(struct quotause *, int);
+int	writetimes(struct quotause *, int, int);
+int	readtimes(struct quotause *, int);
+char *	cvtstoa(time_t);
+int	cvtatos(time_t, char *, time_t *);
+void	freeprivs(struct quotause *);
+int	alldigits(char *s);
+int	hasquota(struct fstab *, int, char **);
 
 void
 usage()
diff --git a/usr.sbin/eeprom/defs.h b/usr.sbin/eeprom/defs.h
index 35870dee007..f51f9217aad 100644
--- a/usr.sbin/eeprom/defs.h
+++ b/usr.sbin/eeprom/defs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: defs.h,v 1.2 1996/03/25 15:55:18 niklas Exp $	*/
+/*	$OpenBSD: defs.h,v 1.3 2002/02/16 21:28:02 millert Exp $	*/
 /*	$NetBSD: defs.h,v 1.2 1996/02/28 01:13:20 thorpej Exp $	*/
 
 /*-
@@ -62,7 +62,7 @@
 struct	keytabent {
 	char	*kt_keyword;		/* keyword for this entry */
 	u_int	kt_offset;		/* offset into prom of value */
-	void	(*kt_handler) __P((struct keytabent *, char *));
+	void	(*kt_handler)(struct keytabent *, char *);
 					/* handler function for this entry */
 };
 
@@ -90,25 +90,25 @@ struct	extabent {
 #endif /* __sparc__ */
 
 /* Sun 3/4 EEPROM handlers. */
-void	ee_hwupdate __P((struct keytabent *, char *));
-void	ee_num8 __P((struct keytabent *, char *));
-void	ee_num16 __P((struct keytabent *, char *));
-void	ee_screensize __P((struct keytabent *, char *));
-void	ee_truefalse __P((struct keytabent *, char *));
-void	ee_bootdev __P((struct keytabent *, char *));
-void	ee_kbdtype __P((struct keytabent *, char *));
-void	ee_constype __P((struct keytabent *, char *));
-void	ee_diagpath __P((struct keytabent *, char *));
-void	ee_banner __P((struct keytabent *, char *));
-void	ee_notsupp __P((struct keytabent *, char *));
+void	ee_hwupdate(struct keytabent *, char *);
+void	ee_num8(struct keytabent *, char *);
+void	ee_num16(struct keytabent *, char *);
+void	ee_screensize(struct keytabent *, char *);
+void	ee_truefalse(struct keytabent *, char *);
+void	ee_bootdev(struct keytabent *, char *);
+void	ee_kbdtype(struct keytabent *, char *);
+void	ee_constype(struct keytabent *, char *);
+void	ee_diagpath(struct keytabent *, char *);
+void	ee_banner(struct keytabent *, char *);
+void	ee_notsupp(struct keytabent *, char *);
 
 /* Sun 3/4 EEPROM checksum routines. */
-u_char	ee_checksum __P((u_char *, size_t));
-void	ee_updatechecksums __P((void));
-void	ee_verifychecksums __P((void));
+u_char	ee_checksum(u_char *, size_t);
+void	ee_updatechecksums(void);
+void	ee_verifychecksums(void);
 
 #ifdef __sparc__
 /* Sparc Openprom handlers. */
-char	*op_handler __P((char *, char *));
-void	op_dump __P((void));
+char	*op_handler(char *, char *);
+void	op_dump(void);
 #endif /* __sparc__ */
diff --git a/usr.sbin/eeprom/eehandlers.c b/usr.sbin/eeprom/eehandlers.c
index a404eba3d40..f8547e275ae 100644
--- a/usr.sbin/eeprom/eehandlers.c
+++ b/usr.sbin/eeprom/eehandlers.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eehandlers.c,v 1.7 2001/09/20 20:42:25 jason Exp $	*/
+/*	$OpenBSD: eehandlers.c,v 1.8 2002/02/16 21:28:02 millert Exp $	*/
 /*	$NetBSD: eehandlers.c,v 1.2 1996/02/28 01:13:22 thorpej Exp $	*/
 
 /*-
@@ -65,12 +65,12 @@ extern	int cksumfail;
 extern	u_short writecount;
 
 struct	timeb;
-extern	time_t get_date __P((char *, struct timeb *));
+extern	time_t get_date(char *, struct timeb *);
 
 static	char err_str[BUFSIZE];
 
-static	void badval __P((struct keytabent *, char *));
-static	int doio __P((struct keytabent *, u_char *, ssize_t, int));
+static	void badval(struct keytabent *, char *);
+static	int doio(struct keytabent *, u_char *, ssize_t, int);
 
 #define BARF(kt) {							\
 	badval((kt), arg);						\
diff --git a/usr.sbin/eeprom/main.c b/usr.sbin/eeprom/main.c
index 4e0a1d01b1b..5d836aa3d8b 100644
--- a/usr.sbin/eeprom/main.c
+++ b/usr.sbin/eeprom/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.7 2001/09/20 20:42:25 jason Exp $	*/
+/*	$OpenBSD: main.c,v 1.8 2002/02/16 21:28:02 millert Exp $	*/
 /*	$NetBSD: main.c,v 1.3 1996/05/16 16:00:55 thorpej Exp $	*/
 
 /*-
@@ -100,11 +100,11 @@ struct	keytabent eekeytab[] = {
 	{ NULL,			0,	ee_notsupp },
 };
 
-static	void action __P((char *));
-static	void dump_prom __P((void));
-static	void usage __P((void));
+static	void action(char *);
+static	void dump_prom(void);
+static	void usage(void);
 #ifdef __sparc__
-static	int getcputype __P((void));
+static	int getcputype(void);
 #endif /* __sparc__ */
 
 char	*path_eeprom = "/dev/eeprom";
diff --git a/usr.sbin/eeprom/ophandlers.c b/usr.sbin/eeprom/ophandlers.c
index 315d59c1c6e..4eaa259e757 100644
--- a/usr.sbin/eeprom/ophandlers.c
+++ b/usr.sbin/eeprom/ophandlers.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ophandlers.c,v 1.4 1996/08/31 13:12:12 deraadt Exp $	*/
+/*	$OpenBSD: ophandlers.c,v 1.5 2002/02/16 21:28:02 millert Exp $	*/
 /*	$NetBSD: ophandlers.c,v 1.2 1996/02/28 01:13:30 thorpej Exp $	*/
 
 /*-
@@ -57,7 +57,7 @@ extern	int verbose;
 
 static	char err_str[BUFSIZE];
 
-static	void op_notsupp __P((struct extabent *, struct opiocdesc *, char *));
+static	void op_notsupp(struct extabent *, struct opiocdesc *, char *);
 
 /*
  * There are several known fields that I either don't know how to
diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c
index c9eaab84c7e..2314f30c90a 100644
--- a/usr.sbin/faithd/faithd.c
+++ b/usr.sbin/faithd/faithd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: faithd.c,v 1.17 2002/01/11 03:51:08 itojun Exp $	*/
+/*	$OpenBSD: faithd.c,v 1.18 2002/02/16 21:28:02 millert Exp $	*/
 /*	$KAME: faithd.c,v 1.40 2001/07/02 14:36:48 itojun Exp $	*/
 
 /*
@@ -103,27 +103,27 @@ static int pflag = 0;
 static int inetd = 0;
 static char *configfile = NULL;
 
-int main __P((int, char **));
+int main(int, char **);
 #if 0
-static int inetd_main __P((int, char **));
+static int inetd_main(int, char **);
 #endif
-static int daemon_main __P((int, char **));
-static void play_service __P((int));
-static void play_child __P((int, struct sockaddr *));
-static int faith_prefix __P((struct sockaddr *));
-static int map6to4 __P((struct sockaddr_in6 *, struct sockaddr_in *));
+static int daemon_main(int, char **);
+static void play_service(int);
+static void play_child(int, struct sockaddr *);
+static int faith_prefix(struct sockaddr *);
+static int map6to4(struct sockaddr_in6 *, struct sockaddr_in *);
 #ifdef FAITH4
-static int map4to6 __P((struct sockaddr_in *, struct sockaddr_in6 *));
+static int map4to6(struct sockaddr_in *, struct sockaddr_in6 *);
 #endif
-static void sig_child __P((int));
-static void sig_terminate __P((int));
-static void start_daemon __P((void));
-static void exit_stderr __P((const char *, ...))
+static void sig_child(int);
+static void sig_terminate(int);
+static void start_daemon(void);
+static void exit_stderr(const char *, ...)
 	__attribute__((__format__(__printf__, 1, 2)));
-static void grab_myaddrs __P((void));
-static void free_myaddrs __P((void));
-static void update_myaddrs __P((void));
-static void usage __P((void));
+static void grab_myaddrs(void);
+static void free_myaddrs(void);
+static void update_myaddrs(void);
+static void usage(void);
 
 int
 main(int argc, char **argv)
diff --git a/usr.sbin/faithd/faithd.h b/usr.sbin/faithd/faithd.h
index cf0521cdba5..82311b1e0ea 100644
--- a/usr.sbin/faithd/faithd.h
+++ b/usr.sbin/faithd/faithd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: faithd.h,v 1.6 2001/09/05 01:31:33 itojun Exp $	*/
+/*	$OpenBSD: faithd.h,v 1.7 2002/02/16 21:28:02 millert Exp $	*/
 /*	$KAME: faithd.h,v 1.7 2001/07/02 14:36:48 itojun Exp $	*/
 
 /*
@@ -33,15 +33,15 @@
 extern char logname[];
 extern int dflag;
 
-extern void tcp_relay __P((int, int, const char *));
-extern void ftp_relay __P((int, int));
-extern int ftp_active __P((int, int, int *, int *));
-extern int ftp_passive __P((int, int, int *, int *));
-extern void rsh_relay __P((int, int));
-extern void rsh_dual_relay __P((int, int));
-extern void exit_success __P((const char *, ...))
+extern void tcp_relay(int, int, const char *);
+extern void ftp_relay(int, int);
+extern int ftp_active(int, int, int *, int *);
+extern int ftp_passive(int, int, int *, int *);
+extern void rsh_relay(int, int);
+extern void rsh_dual_relay(int, int);
+extern void exit_success(const char *, ...)
 	__attribute__((__format__(__printf__, 1, 2)));
-extern void exit_failure __P((const char *, ...))
+extern void exit_failure(const char *, ...)
 	__attribute__((__format__(__printf__, 1, 2)));
 
 #define DEFAULT_PORT_NAME	"telnet"
diff --git a/usr.sbin/faithd/ftp.c b/usr.sbin/faithd/ftp.c
index b5b6b0ea341..8537a34120d 100644
--- a/usr.sbin/faithd/ftp.c
+++ b/usr.sbin/faithd/ftp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ftp.c,v 1.5 2001/09/05 01:31:33 itojun Exp $	*/
+/*	$OpenBSD: ftp.c,v 1.6 2002/02/16 21:28:02 millert Exp $	*/
 /*	$KAME: ftp.c,v 1.13 2001/09/05 01:10:30 itojun Exp $	*/
 
 /*
@@ -67,11 +67,11 @@ enum state { NONE, LPRT, EPRT, PORT, LPSV, EPSV, PASV };
 enum state { NONE, LPRT, EPRT, LPSV, EPSV };
 #endif
 
-static int ftp_activeconn __P((void));
-static int ftp_passiveconn __P((void));
-static int ftp_copy __P((int, int));
-static int ftp_copyresult __P((int, int, enum state));
-static int ftp_copycommand __P((int, int, enum state *));
+static int ftp_activeconn(void);
+static int ftp_passiveconn(void);
+static int ftp_copy(int, int);
+static int ftp_copyresult(int, int, enum state);
+static int ftp_copycommand(int, int, enum state *);
 
 void
 ftp_relay(int ctl6, int ctl4)
diff --git a/usr.sbin/faithd/prefix.c b/usr.sbin/faithd/prefix.c
index 335b5375ae1..a8689c5a34b 100644
--- a/usr.sbin/faithd/prefix.c
+++ b/usr.sbin/faithd/prefix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prefix.c,v 1.3 2001/11/21 04:53:13 itojun Exp $	*/
+/*	$OpenBSD: prefix.c,v 1.4 2002/02/16 21:28:02 millert Exp $	*/
 /*	$KAME: prefix.c,v 1.9 2001/07/02 14:36:49 itojun Exp $	*/
 
 /*
@@ -47,11 +47,11 @@
 #include "faithd.h"
 #include "prefix.h"
 
-static int prefix_set __P((const char *, struct prefix *, int));
-static struct config *config_load1 __P((const char *));
+static int prefix_set(const char *, struct prefix *, int);
+static struct config *config_load1(const char *);
 #if 0
-static void config_show1 __P((const struct config *));
-static void config_show __P((void));
+static void config_show1(const struct config *);
+static void config_show(void);
 #endif
 
 struct config *config_list = NULL;
diff --git a/usr.sbin/faithd/prefix.h b/usr.sbin/faithd/prefix.h
index 971a4347f9a..b8d930ea76c 100644
--- a/usr.sbin/faithd/prefix.h
+++ b/usr.sbin/faithd/prefix.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prefix.h,v 1.1 2001/02/15 17:37:33 itojun Exp $	*/
+/*	$OpenBSD: prefix.h,v 1.2 2002/02/16 21:28:02 millert Exp $	*/
 /*	$KAME: prefix.h,v 1.3 2000/11/19 11:45:38 itojun Exp $	*/
 
 /*
@@ -46,7 +46,7 @@ struct config {
 
 #define _PATH_PREFIX_CONF	"/etc/faithd.conf"
 
-extern const char *prefix_string __P((const struct prefix *));
-extern int prefix_match __P((const struct prefix *, const struct sockaddr *));
-extern int config_load __P((const char *));
-extern const struct config *config_match __P((struct sockaddr *, struct sockaddr *));
+extern const char *prefix_string(const struct prefix *);
+extern int prefix_match(const struct prefix *, const struct sockaddr *);
+extern int config_load(const char *);
+extern const struct config *config_match(struct sockaddr *, struct sockaddr *);
diff --git a/usr.sbin/faithd/tcp.c b/usr.sbin/faithd/tcp.c
index 6f026212cd2..86058322b43 100644
--- a/usr.sbin/faithd/tcp.c
+++ b/usr.sbin/faithd/tcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp.c,v 1.9 2001/11/17 19:49:38 deraadt Exp $	*/
+/*	$OpenBSD: tcp.c,v 1.10 2002/02/16 21:28:02 millert Exp $	*/
 /*	$KAME: tcp.c,v 1.6 2001/07/02 14:36:49 itojun Exp $	*/
 
 /*
@@ -62,12 +62,12 @@ static pid_t ppid = (pid_t)0;
 volatile time_t child_lastactive = (time_t)0;
 static time_t parent_lastactive = (time_t)0;
 
-static void sig_ctimeout __P((int));
-static void sig_child __P((int));
-static void notify_inactive __P((void));
-static void notify_active __P((void));
-static void send_data __P((int, int, const char *, int));
-static void relay __P((int, int, const char *, int));
+static void sig_ctimeout(int);
+static void sig_child(int);
+static void notify_inactive(void);
+static void notify_active(void);
+static void send_data(int, int, const char *, int);
+static void relay(int, int, const char *, int);
 
 /*
  * Inactivity timer:
diff --git a/usr.sbin/grfconfig/grfconfig.c b/usr.sbin/grfconfig/grfconfig.c
index a3babd2b2ad..479c950a3fa 100644
--- a/usr.sbin/grfconfig/grfconfig.c
+++ b/usr.sbin/grfconfig/grfconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grfconfig.c,v 1.4 1997/09/18 22:03:45 niklas Exp $	*/
+/*	$OpenBSD: grfconfig.c,v 1.5 2002/02/16 21:28:02 millert Exp $	*/
 /*	$NetBSD: grfconfig.c,v 1.6 1997/07/29 23:41:12 veego Exp $	*/
 
 /*-
@@ -40,7 +40,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: grfconfig.c,v 1.4 1997/09/18 22:03:45 niklas Exp $";
+static char rcsid[] = "$OpenBSD: grfconfig.c,v 1.5 2002/02/16 21:28:02 millert Exp $";
 #endif /* not lint */
 
 #include <sys/file.h>
@@ -57,8 +57,8 @@ static char rcsid[] = "$OpenBSD: grfconfig.c,v 1.4 1997/09/18 22:03:45 niklas Ex
 extern char *optarg;
 extern int optind;
 
-int main __P((int, char **));
-static void print_rawdata __P((struct grfvideo_mode *, int));    
+int main(int, char **);
+static void print_rawdata(struct grfvideo_mode *, int);    
 
 static struct grf_flag {
 	u_short	grf_flag_number;
diff --git a/usr.sbin/gspa/gspahextoc/gspahextoc.l b/usr.sbin/gspa/gspahextoc/gspahextoc.l
index 1c3fdf10c6b..a0e39b5873e 100644
--- a/usr.sbin/gspa/gspahextoc/gspahextoc.l
+++ b/usr.sbin/gspa/gspahextoc/gspahextoc.l
@@ -35,10 +35,10 @@
 	unsigned long binads;
 
 
-	void dumpstart __P((char *address));
-	void dumpbuf __P((void));
-	void initbuf __P((char *address));
-        void checkbuf __P((void));
+	void dumpstart(char *address);
+	void dumpbuf(void);
+	void initbuf(char *address);
+        void checkbuf(void);
 %%
 :[0-9A-Za-z]+	{if (bufptr>0) dumpbuf(); dumpstart(yytext+1);}
 @[0-9A-Za-z]+	{if (bufptr>0) dumpbuf(); initbuf(yytext+1);}
diff --git a/usr.sbin/httpd/src/regex/mkh b/usr.sbin/httpd/src/regex/mkh
index 252b246c7bd..ee56cd15807 100644
--- a/usr.sbin/httpd/src/regex/mkh
+++ b/usr.sbin/httpd/src/regex/mkh
@@ -1,6 +1,5 @@
 #! /bin/sh
 # mkh - pull headers out of C source
-PATH=/bin:/usr/bin ; export PATH
 
 # egrep pattern to pick out marked lines
 egrep='^ =([ 	]|$)'
@@ -27,7 +26,7 @@ do
 		;;
 	-b)	# funny Berkeley __P macro
 		peel="$peel
-			"'/^\([^#\/][^\/]*[a-zA-Z0-9_)]\)(\(.*\))/s;;\1 __P((\2));'
+			"'/^\([^#\/][^\/]*[a-zA-Z0-9_)]\)(\(.*\))/s;;\1(\2);'
 		shift
 		;;
 	-s)	# compiler doesn't like `static foo();'
@@ -49,6 +48,8 @@ do
 	esac
 done
 
+echo "/* DON'T EVEN THINK ABOUT EDITING THIS, go see regex/Makefile,"
+echo " * search for mkh */"
 if test " $ifndef" != " "
 then
 	echo "#ifndef $ifndef"
diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c
index aa8a73e8530..10aaaba9d1a 100644
--- a/usr.sbin/ifmcstat/ifmcstat.c
+++ b/usr.sbin/ifmcstat/ifmcstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifmcstat.c,v 1.3 2001/11/16 04:46:54 itojun Exp $	*/
+/*	$OpenBSD: ifmcstat.c,v 1.4 2002/02/16 21:28:03 millert Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -76,16 +76,16 @@ struct	nlist nl[] = {
 	{ "" },
 };
 
-const char *inet6_n2a __P((struct in6_addr *));
-int main __P((int, char **));
-char *ifname __P((struct ifnet *));
-void kread __P((u_long, void *, int));
+const char *inet6_n2a(struct in6_addr *);
+int main(int, char **);
+char *ifname(struct ifnet *);
+void kread(u_long, void *, int);
 #if !(defined(__FreeBSD__) && __FreeBSD__ >= 3)
-void acmc __P((struct ether_multi *));
+void acmc(struct ether_multi *);
 #endif
-void if6_addrlist __P((struct ifaddr *));
-void in6_multilist __P((struct in6_multi *));
-struct in6_multi * in6_multientry __P((struct in6_multi *));
+void if6_addrlist(struct ifaddr *);
+void in6_multilist(struct in6_multi *);
+struct in6_multi * in6_multientry(struct in6_multi *);
 
 #if !defined(__NetBSD__) && !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(__OpenBSD__)
 #ifdef __bsdi__
@@ -93,7 +93,7 @@ struct ether_addr {
 	u_int8_t ether_addr_octet[6];
 };
 #endif
-static char *ether_ntoa __P((struct ether_addr *));
+static char *ether_ntoa(struct ether_addr *);
 #endif
 
 #define	KREAD(addr, buf, type) \
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 16ab573dc8f..1669e5d8244 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inetd.c,v 1.87 2002/02/10 01:19:02 millert Exp $	*/
+/*	$OpenBSD: inetd.c,v 1.88 2002/02/16 21:28:03 millert Exp $	*/
 /*	$NetBSD: inetd.c,v 1.11 1996/02/22 11:14:41 mycroft Exp $	*/
 /*
  * Copyright (c) 1983,1991 The Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)inetd.c	5.30 (Berkeley) 6/3/91";*/
-static char rcsid[] = "$OpenBSD: inetd.c,v 1.87 2002/02/10 01:19:02 millert Exp $";
+static char rcsid[] = "$OpenBSD: inetd.c,v 1.88 2002/02/16 21:28:03 millert Exp $";
 #endif /* not lint */
 
 /*
@@ -174,14 +174,14 @@ static char rcsid[] = "$OpenBSD: inetd.c,v 1.87 2002/02/10 01:19:02 millert Exp
 #define	CNT_INTVL	60		/* servers in CNT_INTVL sec. */
 #define	RETRYTIME	(60*10)		/* retry after bind or server fail */
 
-void	config __P((int));
-void	doconfig __P((void));
-void	reap __P((int));
-void	doreap __P((void));
-void	retry __P((int));
-void	doretry __P((void));
-void	die __P((int));
-void	dodie __P((void));
+void	config(int);
+void	doconfig(void);
+void	reap(int);
+void	doreap(void);
+void	retry(int);
+void	doretry(void);
+void	die(int);
+void	dodie(void);
 
 int	 debug = 0;
 int	 nsock, maxsock;
@@ -246,23 +246,23 @@ struct	servtab {
 	struct	servtab *se_next;
 } *servtab;
 
-void echo_stream __P((int, struct servtab *));
-void discard_stream __P((int, struct servtab *));
-void machtime_stream __P((int, struct servtab *));
-void daytime_stream __P((int, struct servtab *));
-void chargen_stream __P((int, struct servtab *));
-void echo_dg __P((int, struct servtab *));
-void discard_dg __P((int, struct servtab *));
-void machtime_dg __P((int, struct servtab *));
-void daytime_dg __P((int, struct servtab *));
-void chargen_dg __P((int, struct servtab *));
+void echo_stream(int, struct servtab *);
+void discard_stream(int, struct servtab *);
+void machtime_stream(int, struct servtab *);
+void daytime_stream(int, struct servtab *);
+void chargen_stream(int, struct servtab *);
+void echo_dg(int, struct servtab *);
+void discard_dg(int, struct servtab *);
+void machtime_dg(int, struct servtab *);
+void daytime_dg(int, struct servtab *);
+void chargen_dg(int, struct servtab *);
 
 struct biltin {
 	char	*bi_service;		/* internally provided service name */
 	int	bi_socktype;		/* type of socket supported */
 	short	bi_fork;		/* 1 if should fork before call */
 	short	bi_wait;		/* 1 if should wait for child */
-	void	(*bi_fn) __P((int, struct servtab *));
+	void	(*bi_fn)(int, struct servtab *);
 } biltins[] = {
 	/* Echo received data */
 	{ "echo",	SOCK_STREAM,	1, 0,	echo_stream },
@@ -298,7 +298,7 @@ char	**Argv;
 char	*LastArg;
 char	*progname;
 
-void logpid __P((void));
+void logpid(void);
 
 void
 fd_grow(fd_set **fdsp, int *bytes, int fd)
@@ -764,17 +764,17 @@ doreap(void)
 	}
 }
 
-int setconfig __P((void));
-void endconfig __P((void));
+int setconfig(void);
+void endconfig(void);
 
-void register_rpc __P((struct servtab *));
-void unregister_rpc __P((struct servtab *));
-void freeconfig __P((struct servtab *));
-void print_service __P((char *, struct servtab *));
-void setup __P((struct servtab *));
-struct servtab *getconfigent __P((void));
-struct servtab *enter __P((struct servtab *));
-int matchconf __P((struct servtab *, struct servtab *));
+void register_rpc(struct servtab *);
+void unregister_rpc(struct servtab *);
+void freeconfig(struct servtab *);
+void print_service(char *, struct servtab *);
+void setup(struct servtab *);
+struct servtab *getconfigent(void);
+struct servtab *enter(struct servtab *);
+int matchconf(struct servtab *, struct servtab *);
 
 void
 config(int sig)
@@ -1063,7 +1063,7 @@ dodie(void)
 	exit(0);
 }
 
-int bump_nofile __P((void));
+int bump_nofile(void);
 
 void
 setup(sep)
@@ -1255,10 +1255,10 @@ matchconf (old, new)
 FILE		*fconfig = NULL;
 char		line[1024];
 char		*defhost;
-char		*skip __P((char **, int));
-char		*nextline __P((FILE *));
-char		*newstr __P((char *));
-struct servtab	*dupconfig __P((struct servtab *));
+char		*skip(char **, int);
+char		*nextline(FILE *);
+char		*newstr(char *);
+struct servtab	*dupconfig(struct servtab *);
 
 int
 setconfig()
diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index 4ea321db198..d923d6b79a5 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iostat.c,v 1.11 2001/11/17 19:49:38 deraadt Exp $	*/
+/*	$OpenBSD: iostat.c,v 1.12 2002/02/16 21:28:03 millert Exp $	*/
 /*	$NetBSD: iostat.c,v 1.10 1996/10/25 18:21:58 scottr Exp $	*/
 
 /*
@@ -113,18 +113,18 @@ volatile sig_atomic_t wantheader;
 #define SHOW_STATS_2	0x0008
 #define SHOW_TOTALS	0x0080
 
-static void cpustats __P((void));
-static void disk_stats __P((double));
-static void disk_stats2 __P((double));
-static void sigheader __P((int));
-static void header __P(());
-static void usage __P((void));
-static void display __P((void));
-static void selectdrives __P((int, char **));
-
-void dkswap __P((void));
-void dkreadstats __P((void));
-int dkinit __P((int));
+static void cpustats(void);
+static void disk_stats(double);
+static void disk_stats2(double);
+static void sigheader(int);
+static void header();
+static void usage(void);
+static void display(void);
+static void selectdrives(int, char **);
+
+void dkswap(void);
+void dkreadstats(void);
+int dkinit(int);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/iteconfig/iteconfig.c b/usr.sbin/iteconfig/iteconfig.c
index da6c621afdf..95504d40767 100644
--- a/usr.sbin/iteconfig/iteconfig.c
+++ b/usr.sbin/iteconfig/iteconfig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iteconfig.c,v 1.3 2000/01/19 16:33:00 espie Exp $ */
+/* $OpenBSD: iteconfig.c,v 1.4 2002/02/16 21:28:03 millert Exp $ */
 /*	$NetBSD: iteconfig.c,v 1.4.6.1 1996/06/04 16:48:24 is Exp $	*/
 /* Copyright (c) 1999 Marc Espie
  * All rights reserved.
@@ -93,12 +93,12 @@
 
 #include "pathnames.h"
 
-void	printcmap __P((colormap_t *, int));
-void	usage __P((void));
-void	xioctl __P((int, int, void *));
-colormap_t *xgetcmap __P((int, int));
-long	xstrtol __P((char *));
-int main __P((int, char **));
+void	printcmap(colormap_t *, int);
+void	usage(void);
+void	xioctl(int, int, void *);
+colormap_t *xgetcmap(int, int);
+long	xstrtol(char *);
+int main(int, char **);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index 4f5d109d86d..ded4251051f 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kgmon.c,v 1.6 2001/09/17 13:42:35 art Exp $	*/
+/*	$OpenBSD: kgmon.c,v 1.7 2002/02/16 21:28:03 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1992, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)kgmon.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: kgmon.c,v 1.6 2001/09/17 13:42:35 art Exp $";
+static char *rcsid = "$OpenBSD: kgmon.c,v 1.7 2002/02/16 21:28:03 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -75,13 +75,13 @@ struct kvmvars {
 
 int	bflag, hflag, kflag, rflag, pflag;
 int	debug = 0;
-void	setprof __P((struct kvmvars *kvp, int state));
-void	dumpstate __P((struct kvmvars *kvp));
-void	reset __P((struct kvmvars *kvp));
-void	kern_readonly __P((int));
-int	getprof __P((struct kvmvars *kvp));
-int	getprofhz __P((struct kvmvars *kvp));
-int	openfiles __P((char *system, char *kmemf, struct kvmvars *kvp));
+void	setprof(struct kvmvars *kvp, int state);
+void	dumpstate(struct kvmvars *kvp);
+void	reset(struct kvmvars *kvp);
+void	kern_readonly(int);
+int	getprof(struct kvmvars *kvp);
+int	getprofhz(struct kvmvars *kvp);
+int	openfiles(char *system, char *kmemf, struct kvmvars *kvp);
 
 int
 main(int argc, char **argv)
diff --git a/usr.sbin/kvm_mkdb/extern.h b/usr.sbin/kvm_mkdb/extern.h
index 2e8b6069771..e4b08f23dfc 100644
--- a/usr.sbin/kvm_mkdb/extern.h
+++ b/usr.sbin/kvm_mkdb/extern.h
@@ -31,8 +31,8 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 6/6/93
- *	$OpenBSD: extern.h,v 1.5 1998/08/23 00:57:12 millert Exp $
+ *	$OpenBSD: extern.h,v 1.6 2002/02/16 21:28:03 millert Exp $
  */
 
-int	create_knlist __P((char *, int, DB *));
-int	testdb __P((char *));
+int	create_knlist(char *, int, DB *);
+int	testdb(char *);
diff --git a/usr.sbin/kvm_mkdb/kvm_mkdb.c b/usr.sbin/kvm_mkdb/kvm_mkdb.c
index 33de5885c49..350dc7aa0f4 100644
--- a/usr.sbin/kvm_mkdb/kvm_mkdb.c
+++ b/usr.sbin/kvm_mkdb/kvm_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_mkdb.c,v 1.10 1999/04/18 17:11:11 espie Exp $	*/
+/*	$OpenBSD: kvm_mkdb.c,v 1.11 2002/02/16 21:28:03 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -43,7 +43,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "from: @(#)kvm_mkdb.c	8.3 (Berkeley) 5/4/95";
 #else
-static char *rcsid = "$OpenBSD: kvm_mkdb.c,v 1.10 1999/04/18 17:11:11 espie Exp $";
+static char *rcsid = "$OpenBSD: kvm_mkdb.c,v 1.11 2002/02/16 21:28:03 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -67,8 +67,8 @@ static char *rcsid = "$OpenBSD: kvm_mkdb.c,v 1.10 1999/04/18 17:11:11 espie Exp
 
 #include "extern.h"
 
-void usage __P((void));
-int kvm_mkdb __P((int, char *, char *, int));
+void usage(void);
+int kvm_mkdb(int, char *, char *, int);
 
 HASHINFO openinfo = {
 	4096,		/* bsize */
diff --git a/usr.sbin/kvm_mkdb/nlist.c b/usr.sbin/kvm_mkdb/nlist.c
index d084523d169..85d6106e3d6 100644
--- a/usr.sbin/kvm_mkdb/nlist.c
+++ b/usr.sbin/kvm_mkdb/nlist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nlist.c,v 1.22 2001/05/11 13:08:09 art Exp $	*/
+/*	$OpenBSD: nlist.c,v 1.23 2002/02/16 21:28:03 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "from: @(#)nlist.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: nlist.c,v 1.22 2001/05/11 13:08:09 art Exp $";
+static char *rcsid = "$OpenBSD: nlist.c,v 1.23 2002/02/16 21:28:03 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -79,7 +79,7 @@ static char *fmterr;
 
 #if defined(_NLIST_DO_AOUT)
 
-static u_long get_kerntext __P((char *kfn, u_int magic));
+static u_long get_kerntext(char *kfn, u_int magic);
 
 int
 __aout_knlist(fd, db)
@@ -626,7 +626,7 @@ out:
 #endif /* _NLIST_DO_ECOFF */
 
 static struct knlist_handlers {
-	int	(*fn) __P((int fd, DB *db));
+	int	(*fn)(int fd, DB *db);
 } nlist_fn[] = {
 #ifdef _NLIST_DO_AOUT
 	{ __aout_knlist },
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c
index bb1468459e4..48b4f45eea0 100644
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: common.c,v 1.14 2001/12/06 03:12:30 ericj Exp $	*/
+/*	$OpenBSD: common.c,v 1.15 2002/02/16 21:28:03 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -42,7 +42,7 @@
 #if 0
 static const char sccsid[] = "@(#)common.c	8.5 (Berkeley) 4/28/95";
 #else
-static const char rcsid[] = "$OpenBSD: common.c,v 1.14 2001/12/06 03:12:30 ericj Exp $";
+static const char rcsid[] = "$OpenBSD: common.c,v 1.15 2002/02/16 21:28:03 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -121,7 +121,7 @@ char	*printcapdb[2] = { _PATH_PRINTCAP, 0 };
 
 extern uid_t	uid, euid;
 
-static int compar __P((const void *, const void *));
+static int compar(const void *, const void *);
 
 /*
  * Create a TCP connection to host "rhost" at port "rport".
diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h
index 01f0a3c599c..335b90d8332 100644
--- a/usr.sbin/lpr/common_source/lp.h
+++ b/usr.sbin/lpr/common_source/lp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lp.h,v 1.6 2001/12/06 03:12:30 ericj Exp $	*/
+/*	$OpenBSD: lp.h,v 1.7 2002/02/16 21:28:03 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -105,28 +105,28 @@ struct queue {
 __BEGIN_DECLS
 struct dirent;
 
-void     blankfill __P((int));
-char	*checkremote __P((void));
-int      chk __P((char *));
-void     displayq __P((int));
-void     dump __P((char *, char *, int));
-void	 fatal __P((const char *, ...));
-int	 getline __P((FILE *));
-int	 getport __P((char *, int));
+void     blankfill(int);
+char	*checkremote(void);
+int      chk(char *);
+void     displayq(int);
+void     dump(char *, char *, int);
+void	 fatal(const char *, ...);
+int	 getline(FILE *);
+int	 getport(char *, int);
 int	 getq __P((struct queue *(*[])));
-void     header __P((void));
-void     inform __P((char *));
-int      inlist __P((char *, char *));
-int      iscf __P((struct dirent *));
-int      isowner __P((char *, char *));
-void     ldump __P((char *, char *, int));
-int      lockchk __P((char *));
-void     prank __P((int));
-void     process __P((char *));
-void     rmjob __P((void));
-void     rmremote __P((void));
-void     show __P((char *, char *, int));
-int      startdaemon __P((char *));
-void     nodaemon __P((void));
-void     delay __P((int));
+void     header(void);
+void     inform(char *);
+int      inlist(char *, char *);
+int      iscf(struct dirent *);
+int      isowner(char *, char *);
+void     ldump(char *, char *, int);
+int      lockchk(char *);
+void     prank(int);
+void     process(char *);
+void     rmjob(void);
+void     rmremote(void);
+void     show(char *, char *, int);
+int      startdaemon(char *);
+void     nodaemon(void);
+void     delay(int);
 __END_DECLS
diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c
index 279d06c35c5..fe7e125c3b9 100644
--- a/usr.sbin/lpr/common_source/rmjob.c
+++ b/usr.sbin/lpr/common_source/rmjob.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rmjob.c,v 1.11 2001/08/30 17:38:13 millert Exp $	*/
+/*	$OpenBSD: rmjob.c,v 1.12 2002/02/16 21:28:03 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -37,7 +37,7 @@
 #if 0
 static const char sccsid[] = "@(#)rmjob.c	8.2 (Berkeley) 4/28/95";
 #else
-static const char rcsid[] = "$OpenBSD: rmjob.c,v 1.11 2001/08/30 17:38:13 millert Exp $";
+static const char rcsid[] = "$OpenBSD: rmjob.c,v 1.12 2002/02/16 21:28:03 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -75,7 +75,7 @@ static char	current[NAME_MAX];	/* active control file name */
 
 extern uid_t	uid, euid;		/* real and effective user id's */
 
-static	void	do_unlink __P((char *));
+static	void	do_unlink(char *);
 
 void
 rmjob()
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index 206d8e435ad..ac98baf23c4 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmds.c,v 1.14 2001/08/30 17:38:13 millert Exp $	*/
+/*	$OpenBSD: cmds.c,v 1.15 2002/02/16 21:28:03 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -44,7 +44,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)cmds.c	8.2 (Berkeley) 4/28/95";
 #else
-static const char rcsid[] = "$OpenBSD: cmds.c,v 1.14 2001/08/30 17:38:13 millert Exp $";
+static const char rcsid[] = "$OpenBSD: cmds.c,v 1.15 2002/02/16 21:28:03 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -74,20 +74,20 @@ static const char rcsid[] = "$OpenBSD: cmds.c,v 1.14 2001/08/30 17:38:13 millert
 
 extern uid_t	uid, euid;
 
-void	abortpr __P((int));
-void	cleanpr __P((void));
-void	disablepr __P((void));
-int	doarg __P((char *));
-int	doselect __P((struct dirent *));
-void	enablepr __P((void));
-void	prstat __P((void));
-void	putmsg __P((int, char **));
-int	sortq __P((const void *, const void *));
-void	startpr __P((int));
-void	stoppr __P((void));
-int	touch __P((struct queue *));
-void	unlinkf __P((char *));
-void	upstat __P((char *));
+void	abortpr(int);
+void	cleanpr(void);
+void	disablepr(void);
+int	doarg(char *);
+int	doselect(struct dirent *);
+void	enablepr(void);
+void	prstat(void);
+void	putmsg(int, char **);
+int	sortq(const void *, const void *);
+void	startpr(int);
+void	stoppr(void);
+int	touch(struct queue *);
+void	unlinkf(char *);
+void	upstat(char *);
 
 /*
  * kill an existing daemon and disable printing.
diff --git a/usr.sbin/lpr/lpc/extern.h b/usr.sbin/lpr/lpc/extern.h
index 88624141133..16a1c725bb4 100644
--- a/usr.sbin/lpr/lpc/extern.h
+++ b/usr.sbin/lpr/lpc/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.2 1997/01/17 16:12:36 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.3 2002/02/16 21:28:03 millert Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -41,19 +41,19 @@
 
 
 __BEGIN_DECLS
-void	clean __P((int, char **));
-void	disable __P((int, char **));
-void	doabort __P((int, char **));
-void	down __P((int, char **));
-void	enable __P((int, char **));
-void	help __P((int, char **));
-void	quit __P((int, char **));
-void	restart __P((int, char **));
-void	startcmd __P((int, char **));
-void	status __P((int, char **));
-void	stop __P((int, char **));
-void	topq __P((int, char **));
-void	up __P((int, char **));
+void	clean(int, char **);
+void	disable(int, char **);
+void	doabort(int, char **);
+void	down(int, char **);
+void	enable(int, char **);
+void	help(int, char **);
+void	quit(int, char **);
+void	restart(int, char **);
+void	startcmd(int, char **);
+void	status(int, char **);
+void	stop(int, char **);
+void	topq(int, char **);
+void	up(int, char **);
 __END_DECLS
 
 extern int NCMDS;
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index 3c3ffe04331..5b4cfc20c2a 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpc.c,v 1.11 2001/12/06 03:12:30 ericj Exp $	*/
+/*	$OpenBSD: lpc.c,v 1.12 2002/02/16 21:28:03 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -44,7 +44,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)lpc.c	8.3 (Berkeley) 4/28/95";
 #else
-static const char rcsid[] = "$OpenBSD: lpc.c,v 1.11 2001/12/06 03:12:30 ericj Exp $";
+static const char rcsid[] = "$OpenBSD: lpc.c,v 1.12 2002/02/16 21:28:03 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -82,11 +82,11 @@ int	margc;
 char	*margv[MAX_MARGV];
 uid_t	uid, euid;
 
-void		 cmdscanner __P((void));
-struct cmd	*getcmd __P((char *));
-void		 intr __P((int));
-void		 makeargv __P((void));
-int		 ingroup __P((char *));
+void		 cmdscanner(void);
+struct cmd	*getcmd(char *);
+void		 intr(int);
+void		 makeargv(void);
+int		 ingroup(char *);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/lpr/lpc/lpc.h b/usr.sbin/lpr/lpc/lpc.h
index bc5378e7ecd..281eb2d2c1e 100644
--- a/usr.sbin/lpr/lpc/lpc.h
+++ b/usr.sbin/lpr/lpc/lpc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpc.h,v 1.2 1997/01/17 16:12:38 millert Exp $	*/
+/*	$OpenBSD: lpc.h,v 1.3 2002/02/16 21:28:03 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -42,6 +42,6 @@ struct	cmd {
 	char	*c_name;		/* command name */
 	char	*c_help;		/* help message */
 					/* routine to do the work */
-	void	(*c_handler) __P((int, char *[]));
+	void	(*c_handler)(int, char *[]);
 	int	c_priv;			/* privileged command */
 };
diff --git a/usr.sbin/lpr/lpd/extern.h b/usr.sbin/lpr/lpd/extern.h
index ae075c35690..9c1ff356469 100644
--- a/usr.sbin/lpr/lpd/extern.h
+++ b/usr.sbin/lpr/lpd/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.3 1997/07/17 09:09:11 deraadt Exp $	*/
+/*	$OpenBSD: extern.h,v 1.4 2002/02/16 21:28:03 millert Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -53,11 +53,11 @@ struct info {
 	struct winsize win;                     /* window info */
 }; 
 
-void       printjob __P((void));
-void       recvjob __P((void));
-void       sttyclearflags __P((struct termios *tp, int flags));
-void       sttysetflags __P((struct termios *tp, int flags));
-void       sttyclearlflags __P((struct termios *tp, int flags));
-void       sttysetlflags __P((struct termios *tp, int flags));
-int	   ksearch __P((char ***, struct info *));
-int	   msearch __P((char ***, struct info *));
+void       printjob(void);
+void       recvjob(void);
+void       sttyclearflags(struct termios *tp, int flags);
+void       sttysetflags(struct termios *tp, int flags);
+void       sttyclearlflags(struct termios *tp, int flags);
+void       sttysetlflags(struct termios *tp, int flags);
+int	   ksearch(char ***, struct info *);
+int	   msearch(char ***, struct info *);
diff --git a/usr.sbin/lpr/lpd/key.c b/usr.sbin/lpr/lpd/key.c
index a4f8df16149..259e97f28a6 100644
--- a/usr.sbin/lpr/lpd/key.c
+++ b/usr.sbin/lpr/lpd/key.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key.c,v 1.3 2001/08/30 17:38:13 millert Exp $	*/
+/*	$OpenBSD: key.c,v 1.4 2002/02/16 21:28:03 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -37,7 +37,7 @@
 #if 0
 static const char sccsid[] = "@(#)key.c	8.3 (Berkeley) 4/2/94";
 #else
-static const char rcsid[] = "$OpenBSD: key.c,v 1.3 2001/08/30 17:38:13 millert Exp $";
+static const char rcsid[] = "$OpenBSD: key.c,v 1.4 2002/02/16 21:28:03 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -56,22 +56,22 @@ static const char rcsid[] = "$OpenBSD: key.c,v 1.3 2001/08/30 17:38:13 millert E
 #include "extern.h"
 
 __BEGIN_DECLS
-void	f_cbreak __P((struct info *));
-void	f_columns __P((struct info *));
-void	f_dec __P((struct info *));
-void	f_extproc __P((struct info *));
-void	f_ispeed __P((struct info *));
-void	f_nl __P((struct info *));
-void	f_ospeed __P((struct info *));
-void	f_raw __P((struct info *));
-void	f_rows __P((struct info *));
-void	f_sane __P((struct info *));
-void	f_tty __P((struct info *));
+void	f_cbreak(struct info *);
+void	f_columns(struct info *);
+void	f_dec(struct info *);
+void	f_extproc(struct info *);
+void	f_ispeed(struct info *);
+void	f_nl(struct info *);
+void	f_ospeed(struct info *);
+void	f_raw(struct info *);
+void	f_rows(struct info *);
+void	f_sane(struct info *);
+void	f_tty(struct info *);
 __END_DECLS
 
 static struct key {
 	char *name;				/* name */
-	void (*f) __P((struct info *));		/* function */
+	void (*f)(struct info *);		/* function */
 #define	F_NEEDARG	0x01			/* needs an argument */
 #define	F_OFFOK		0x02			/* can turn off */
 	int flags;
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index 7a9429446f0..d9465a32cc9 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpd.c,v 1.27 2002/01/21 17:30:38 deraadt Exp $ */
+/*	$OpenBSD: lpd.c,v 1.28 2002/02/16 21:28:03 millert Exp $ */
 /*	$NetBSD: lpd.c,v 1.7 1996/04/24 14:54:06 mrg Exp $	*/
 
 /*
@@ -45,7 +45,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)lpd.c	8.7 (Berkeley) 5/10/95";
 #else
-static const char rcsid[] = "$OpenBSD: lpd.c,v 1.27 2002/01/21 17:30:38 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: lpd.c,v 1.28 2002/02/16 21:28:03 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -104,17 +104,17 @@ static const char rcsid[] = "$OpenBSD: lpd.c,v 1.27 2002/01/21 17:30:38 deraadt
 #include "pathnames.h"
 #include "extern.h"
 
-extern int __ivaliduser __P((FILE *, in_addr_t, const char *, const char *));
+extern int __ivaliduser(FILE *, in_addr_t, const char *, const char *);
 
 int	lflag;				/* log requests flag */
 int	from_remote;			/* from remote socket */
 
-static void       reapchild __P((int));
-static void       mcleanup __P((int));
-static void       doit __P((void));
-static void       startup __P((void));
-static void       chkhost __P((struct sockaddr_in *));
-static int	  ckqueue __P((char *));
+static void       reapchild(int);
+static void       mcleanup(int);
+static void       doit(void);
+static void       startup(void);
+static void       chkhost(struct sockaddr_in *);
+static int	  ckqueue(char *);
 
 /* unused, needed for lpc */
 volatile sig_atomic_t gotintr;
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index 14586c9a374..fb10a6dbcae 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printjob.c,v 1.29 2002/01/21 17:30:38 deraadt Exp $ */
+/*	$OpenBSD: printjob.c,v 1.30 2002/02/16 21:28:04 millert Exp $ */
 /*	$NetBSD: printjob.c,v 1.9.4.3 1996/07/12 22:31:39 jtc Exp $	*/
 
 /*
@@ -115,25 +115,25 @@ static char	pxwidth[10] = "-x";	/* page width in pixels */
 static char	tempfile[] = "errsXXXXXXXXXX"; /* file name for filter output */
 static char	width[10] = "-w";	/* page width in static characters */
 
-static void       abortpr __P((int));
-static void       banner __P((char *, char *));
-static int        dofork __P((int));
-static int        dropit __P((int));
-static void       init __P((void));
-static void       openpr __P((void));
-static void       opennet __P((char *));
-static void       opentty __P((void));
-static void       openrem __P((void));
-static int        print __P((int, char *));
-static int        printit __P((char *));
-static void       pstatus __P((const char *, ...));
-static char       response __P((void));
-static void       scan_out __P((int, char *, int));
-static char      *scnline __P((int, char *, int));
-static int        sendfile __P((int, char *));
-static int        sendit __P((char *));
-static void       sendmail __P((char *, int));
-static void       setty __P((void));
+static void       abortpr(int);
+static void       banner(char *, char *);
+static int        dofork(int);
+static int        dropit(int);
+static void       init(void);
+static void       openpr(void);
+static void       opennet(char *);
+static void       opentty(void);
+static void       openrem(void);
+static int        print(int, char *);
+static int        printit(char *);
+static void       pstatus(const char *, ...);
+static char       response(void);
+static void       scan_out(int, char *, int);
+static char      *scnline(int, char *, int);
+static int        sendfile(int, char *);
+static int        sendit(char *);
+static void       sendmail(char *, int);
+static void       setty(void);
 
 void
 printjob()
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index 490485d3142..71021f5114b 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: recvjob.c,v 1.17 2001/11/27 17:24:27 millert Exp $	*/
+/*	$OpenBSD: recvjob.c,v 1.18 2002/02/16 21:28:04 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -44,7 +44,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)recvjob.c	8.2 (Berkeley) 4/27/95";
 #else
-static const char rcsid[] = "$OpenBSD: recvjob.c,v 1.17 2001/11/27 17:24:27 millert Exp $";
+static const char rcsid[] = "$OpenBSD: recvjob.c,v 1.18 2002/02/16 21:28:04 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -77,13 +77,13 @@ static int	 minfree;       /* keep at least minfree blocks available */
 static char	*sp = "";
 static char	 tfname[NAME_MAX];	/* tmp copy of cf before linking */
 
-static int        chksize __P((int));
-static void       frecverr __P((const char *, ...));
-static int        noresponse __P((void));
-static void       rcleanup __P((int));
-static int        read_number __P((char *));
-static int        readfile __P((char *, int));
-static int        readjob __P((void));
+static int        chksize(int);
+static void       frecverr(const char *, ...);
+static int        noresponse(void);
+static void       rcleanup(int);
+static int        read_number(char *);
+static int        readfile(char *, int);
+static int        readjob(void);
 
 
 void
diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index 6e2b09ec64a..7d578382b3e 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpq.c,v 1.10 2001/12/06 03:12:31 ericj Exp $	*/
+/*	$OpenBSD: lpq.c,v 1.11 2002/02/16 21:28:04 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -44,7 +44,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)lpq.c	8.3 (Berkeley) 5/10/95";
 #else
-static const char rcsid[] = "$OpenBSD: lpq.c,v 1.10 2001/12/06 03:12:31 ericj Exp $";
+static const char rcsid[] = "$OpenBSD: lpq.c,v 1.11 2002/02/16 21:28:04 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -79,8 +79,8 @@ uid_t	uid, euid;
 
 volatile sig_atomic_t gotintr;
 
-static int ckqueue __P((char *));
-void usage __P((void));
+static int ckqueue(char *);
+void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 71054fe86b6..99c84378bc8 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpr.c,v 1.23 2001/12/06 03:12:31 ericj Exp $ */
+/*	$OpenBSD: lpr.c,v 1.24 2002/02/16 21:28:04 millert Exp $ */
 /*	$NetBSD: lpr.c,v 1.10 1996/03/21 18:12:25 jtc Exp $	*/
 
 /*
@@ -50,7 +50,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)lpr.c	8.4 (Berkeley) 4/28/95";
 #else
-static const char rcsid[] = "$OpenBSD: lpr.c,v 1.23 2001/12/06 03:12:31 ericj Exp $";
+static const char rcsid[] = "$OpenBSD: lpr.c,v 1.24 2002/02/16 21:28:04 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -108,16 +108,16 @@ static struct stat statb;
 
 volatile sig_atomic_t gotintr;
 
-static void	 card __P((int, char *));
-static void	 chkprinter __P((char *));
-static void	 cleanup __P((int));
-static void	 copy __P((int, char []));
-static char	*linked __P((char *));
-static char	*lmktemp __P((char *, int, int));
-static void	 mktemps __P((void));
-static int	 nfile __P((char *));
-static int	 test __P((char *));
-static char	*itoa __P((int));
+static void	 card(int, char *);
+static void	 chkprinter(char *);
+static void	 cleanup(int);
+static void	 copy(int, char []);
+static char	*linked(char *);
+static char	*lmktemp(char *, int, int);
+static void	 mktemps(void);
+static int	 nfile(char *);
+static int	 test(char *);
+static char	*itoa(int);
 
 uid_t	uid, euid;
 
diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c
index e94c43a0974..226730c6302 100644
--- a/usr.sbin/lpr/lprm/lprm.c
+++ b/usr.sbin/lpr/lprm/lprm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lprm.c,v 1.9 2001/12/06 03:12:31 ericj Exp $	*/
+/*	$OpenBSD: lprm.c,v 1.10 2002/02/16 21:28:04 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -44,7 +44,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)lprm.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: lprm.c,v 1.9 2001/12/06 03:12:31 ericj Exp $";
+static const char rcsid[] = "$OpenBSD: lprm.c,v 1.10 2002/02/16 21:28:04 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -86,7 +86,7 @@ static char	luser[MAXLOGNAME];	/* buffer for person */
 
 volatile sig_atomic_t gotintr;
 
-void usage __P((void));
+void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index 7ba97d9615e..f355056a4e8 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pac.c,v 1.11 2001/11/23 03:58:19 deraadt Exp $ */
+/*	$OpenBSD: pac.c,v 1.12 2002/02/16 21:28:04 millert Exp $ */
 /*	$NetBSD: pac.c,v 1.7 1996/03/21 18:21:20 jtc Exp $	*/
 
 /*
@@ -45,7 +45,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)pac.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: pac.c,v 1.11 2001/11/23 03:58:19 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: pac.c,v 1.12 2002/02/16 21:28:04 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -100,15 +100,15 @@ struct hent {
 
 static struct	hent	*hashtab[HSHSIZE];	/* Hash table proper */
 
-static void	account __P((FILE *));
-static int	any __P((int, char []));
-static int	chkprinter __P((char *));
-static void	dumpit __P((void));
-static int	hash __P((char []));
-static struct	hent *enter __P((char []));
-static struct	hent *lookup __P((char []));
-static int	qucmp __P((const void *, const void *));
-static void	rewrite __P((void));
+static void	account(FILE *);
+static int	any(int, char []);
+static int	chkprinter(char *);
+static void	dumpit(void);
+static int	hash(char []);
+static struct	hent *enter(char []);
+static struct	hent *lookup(char []);
+static int	qucmp(const void *, const void *);
+static void	rewrite(void);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c
index acafd45307e..a4284da0b04 100644
--- a/usr.sbin/mailwrapper/mailwrapper.c
+++ b/usr.sbin/mailwrapper/mailwrapper.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mailwrapper.c,v 1.9 2001/08/08 00:47:52 jakob Exp $	*/
+/*	$OpenBSD: mailwrapper.c,v 1.10 2002/02/16 21:28:04 millert Exp $	*/
 /*	$NetBSD: mailwrapper.c,v 1.2 1999/02/20 22:10:07 thorpej Exp $	*/
 
 /*
@@ -48,11 +48,11 @@ struct arglist {
 	char **argv;
 };
 
-int main __P((int, char *[], char *[]));
+int main(int, char *[], char *[]);
 
-static void initarg __P((struct arglist *));
-static void addarg __P((struct arglist *, const char *, int));
-static void freearg __P((struct arglist *, int));
+static void initarg(struct arglist *);
+static void addarg(struct arglist *, const char *, int);
+static void freearg(struct arglist *, int);
 
 extern const char *__progname;	/* from crt0.o */
 
diff --git a/usr.sbin/map-mbone/mapper.c b/usr.sbin/map-mbone/mapper.c
index 531ffa15b69..4fdcc9ea833 100644
--- a/usr.sbin/map-mbone/mapper.c
+++ b/usr.sbin/map-mbone/mapper.c
@@ -87,22 +87,22 @@ int	show_names = TRUE;
 vifi_t  numvifs;		/* to keep loader happy */
 				/* (see COPY_TABLES macro called in kern.c) */
 
-Node *			find_node __P((u_int32_t addr, Node **ptr));
-Interface *		find_interface __P((u_int32_t addr, Node *node));
-Neighbor *		find_neighbor __P((u_int32_t addr, Node *node));
-int			main __P((int argc, char *argv[]));
-void			ask __P((u_int32_t dst));
-void			ask2 __P((u_int32_t dst));
-int			retry_requests __P((Node *node));
-char *			inet_name __P((u_int32_t addr));
-void			print_map __P((Node *node));
-char *			graph_name __P((u_int32_t addr, char *buf));
-void			graph_edges __P((Node *node));
-void			elide_aliases __P((Node *node));
-void			graph_map __P((void));
+Node *			find_node(u_int32_t addr, Node **ptr);
+Interface *		find_interface(u_int32_t addr, Node *node);
+Neighbor *		find_neighbor(u_int32_t addr, Node *node);
+int			main(int argc, char *argv[]);
+void			ask(u_int32_t dst);
+void			ask2(u_int32_t dst);
+int			retry_requests(Node *node);
+char *			inet_name(u_int32_t addr);
+void			print_map(Node *node);
+char *			graph_name(u_int32_t addr, char *buf);
+void			graph_edges(Node *node);
+void			elide_aliases(Node *node);
+void			graph_map(void);
 int			get_number __P((int *var, int deflt, char ***pargv,
 						int *pargc));
-u_int32_t			host_addr __P((char *name));
+u_int32_t			host_addr(char *name);
 
 
 Node *find_node(addr, ptr)
diff --git a/usr.sbin/memconfig/memconfig.c b/usr.sbin/memconfig/memconfig.c
index b4aa5e0ecb9..e73847f86d0 100644
--- a/usr.sbin/memconfig/memconfig.c
+++ b/usr.sbin/memconfig/memconfig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: memconfig.c,v 1.3 2001/07/27 20:34:36 pvalchev Exp $ */
+/* $OpenBSD: memconfig.c,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 /*-
  * Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
  * All rights reserved.
@@ -58,17 +58,17 @@ struct
 	{NULL,			0,			0}
 };
 
-static void	listfunc __P((int, int, char *[]));
-static void	setfunc __P((int, int, char *[]));
-static void	clearfunc __P((int, int, char *[]));
-static void	helpfunc __P((int, int, char *[]));
-static void	help __P((char *));
+static void	listfunc(int, int, char *[]);
+static void	setfunc(int, int, char *[]);
+static void	clearfunc(int, int, char *[]);
+static void	helpfunc(int, int, char *[]);
+static void	help(char *);
 
 struct 
 {
 	char	*cmd;
 	char	*desc;
-	void	(*func) __P((int, int, char *[]));
+	void	(*func)(int, int, char *[]);
 } functions[] = {
 	{"list",	
 	 "List current memory range attributes\n"
diff --git a/usr.sbin/mopd/common/cmp.h b/usr.sbin/mopd/common/cmp.h
index ceca08b87bb..dda18aa514c 100644
--- a/usr.sbin/mopd/common/cmp.h
+++ b/usr.sbin/mopd/common/cmp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmp.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: cmp.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: cmp.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: cmp.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -39,7 +39,7 @@
 int	mopCmpEAddr (/* u_char *,u_char * */);
 #else
 __BEGIN_DECLS
-int	mopCmpEAddr __P((u_char *,u_char *));
+int	mopCmpEAddr(u_char *,u_char *);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/device.h b/usr.sbin/mopd/common/device.h
index a981cbedb9d..b305a83eb18 100644
--- a/usr.sbin/mopd/common/device.h
+++ b/usr.sbin/mopd/common/device.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: device.h,v 1.2 1996/09/21 19:11:24 maja Exp $ */
+/*	$OpenBSD: device.h,v 1.3 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: device.h,v 1.2 1996/09/21 19:11:24 maja Exp $
+ *	$OpenBSD: device.h,v 1.3 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -44,10 +44,10 @@ void	deviceInitAll (/* void */);
 #else
 __BEGIN_DECLS
 #ifdef	DEV_NEW_CONF
-void	deviceEthAddr __P((char *,u_char *));
+void	deviceEthAddr(char *,u_char *);
 #endif
-void	deviceInitOne __P((char *));
-void	deviceInitAll __P((void));
+void	deviceInitOne(char *);
+void	deviceInitAll(void);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/dl.h b/usr.sbin/mopd/common/dl.h
index 8e01586efad..99a3bd79e0b 100644
--- a/usr.sbin/mopd/common/dl.h
+++ b/usr.sbin/mopd/common/dl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: dl.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: dl.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: dl.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -39,7 +39,7 @@
 void	mopDumpDL       (/* FILE *, u_char *, int */);
 #else
 __BEGIN_DECLS
-void	mopDumpDL       __P((FILE *, u_char *, int));
+void	mopDumpDL(FILE *, u_char *, int);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/file.h b/usr.sbin/mopd/common/file.h
index 3db49491dc0..076e31b8e50 100644
--- a/usr.sbin/mopd/common/file.h
+++ b/usr.sbin/mopd/common/file.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: file.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: file.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: file.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -50,14 +50,14 @@ int	GetFileInfo    (/* int, u_long *, u_long *, int *, u_long *, u_long *,
 			   u_long *, u_long *, u_long *, u_long * */);
 #else
 __BEGIN_DECLS
-void	mopFilePutLX    __P((u_char *, int, u_long, int));
-void	mopFilePutBX    __P((u_char *, int, u_long, int));
-u_long	mopFileGetLX    __P((u_char *, int, int));
-u_long	mopFileGetBX    __P((u_char *, int, int));
-void	mopFileSwapX    __P((u_char *, int, int));
-int	CheckMopFile    __P((int));
-int	GetMopFileInfo  __P((int, u_long *, u_long *));
-int	CheckAOutFile   __P((int));
+void	mopFilePutLX(u_char *, int, u_long, int);
+void	mopFilePutBX(u_char *, int, u_long, int);
+u_long	mopFileGetLX(u_char *, int, int);
+u_long	mopFileGetBX(u_char *, int, int);
+void	mopFileSwapX(u_char *, int, int);
+int	CheckMopFile(int);
+int	GetMopFileInfo(int, u_long *, u_long *);
+int	CheckAOutFile(int);
 int	GetAOutFileInfo __P((int, u_long *, u_long *, u_long *, u_long *,
 			     u_long *, u_long *, u_long *, u_long *, int *));
 int	GetFileInfo     __P((int, u_long *, u_long *, int *,
diff --git a/usr.sbin/mopd/common/get.h b/usr.sbin/mopd/common/get.h
index 7af425ae5e4..03c32018325 100644
--- a/usr.sbin/mopd/common/get.h
+++ b/usr.sbin/mopd/common/get.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: get.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: get.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: get.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: get.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -46,14 +46,14 @@ void	mopGetHeader (/* u_char *, int *, u_char **, u_char **, u_short *,
 u_short	mopGetLength (/* u_char *, int */);
 #else
 __BEGIN_DECLS
-u_char	mopGetChar   __P((u_char *,int *));
-u_short	mopGetShort  __P((u_char *,int *));
-u_long	mopGetLong   __P((u_char *,int *));
-void	mopGetMulti  __P((u_char *,int *,u_char *,int));
-int	mopGetTrans  __P((u_char *, int));
+u_char	mopGetChar(u_char *,int *);
+u_short	mopGetShort(u_char *,int *);
+u_long	mopGetLong(u_char *,int *);
+void	mopGetMulti(u_char *,int *,u_char *,int);
+int	mopGetTrans(u_char *, int);
 void	mopGetHeader __P((u_char *, int *, u_char **, u_char **, u_short *,
 			  int *, int));
-u_short	mopGetLength __P((u_char *, int));
+u_short	mopGetLength(u_char *, int);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/loop-bsd.c b/usr.sbin/mopd/common/loop-bsd.c
index b85f38633d6..7e308d774dc 100644
--- a/usr.sbin/mopd/common/loop-bsd.c
+++ b/usr.sbin/mopd/common/loop-bsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loop-bsd.c,v 1.4 1998/07/07 17:32:46 art Exp $ */
+/*	$OpenBSD: loop-bsd.c,v 1.5 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: loop-bsd.c,v 1.4 1998/07/07 17:32:46 art Exp $";
+static char rcsid[] = "$OpenBSD: loop-bsd.c,v 1.5 2002/02/16 21:28:04 millert Exp $";
 #endif
 
 #include <stdlib.h>
@@ -93,7 +93,7 @@ mopReadDL()
  */
 struct if_info *iflist;
 
-void   mopProcess    __P((struct if_info *, u_char *));
+void   mopProcess(struct if_info *, u_char *);
 
 /*
  * Loop indefinitely listening for MOP requests on the
diff --git a/usr.sbin/mopd/common/nma.h b/usr.sbin/mopd/common/nma.h
index 5694dda2857..1ead51b5007 100644
--- a/usr.sbin/mopd/common/nma.h
+++ b/usr.sbin/mopd/common/nma.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nma.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: nma.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1995 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: nma.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: nma.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -40,8 +40,8 @@ char	*nmaGetShort  (/* int */);
 char	*nmaGetDevice (/* int */);
 #else
 __BEGIN_DECLS
-char	*nmaGetShort  __P((int));
-char	*nmaGetDevice __P((int));
+char	*nmaGetShort(int);
+char	*nmaGetDevice(int);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/pf.h b/usr.sbin/mopd/common/pf.h
index 3277d98e940..fcec3fbecec 100644
--- a/usr.sbin/mopd/common/pf.h
+++ b/usr.sbin/mopd/common/pf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: pf.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: pf.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: pf.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -45,13 +45,13 @@ int	pfRead     (/* int, u_char *, int */);
 int	pfWrite    (/* int, u_char *, int, int  */);
 #else
 __BEGIN_DECLS
-int	pfTrans	   __P((char *));
-int	pfInit     __P((char *, int, u_short, int));
-int	pfEthAddr  __P((int, u_char *));
-int	pfAddMulti __P((int, char *, char *));
-int	pfDelMulti __P((int, char *, char *));
-int	pfRead     __P((int, u_char *, int));
-int	pfWrite    __P((int, u_char *, int, int));
+int	pfTrans(char *);
+int	pfInit(char *, int, u_short, int);
+int	pfEthAddr(int, u_char *);
+int	pfAddMulti(int, char *, char *);
+int	pfDelMulti(int, char *, char *);
+int	pfRead(int, u_char *, int);
+int	pfWrite(int, u_char *, int, int);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/print.h b/usr.sbin/mopd/common/print.h
index b7fa4d3af13..d79f58e27c2 100644
--- a/usr.sbin/mopd/common/print.h
+++ b/usr.sbin/mopd/common/print.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: print.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: print.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: print.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -48,14 +48,14 @@ void	mopPrintInfo      (/* FILE *, u_char *, int *, u_short,
 			      u_char, int */);
 #else
 __BEGIN_DECLS
-void	mopPrintHWA	  __P((FILE *, u_char *));
-void	mopPrintBPTY	  __P((FILE *, u_char));
-void	mopPrintPGTY      __P((FILE *, u_char));
-void	mopPrintOneline   __P((FILE *, u_char *, int));
-void	mopPrintHeader    __P((FILE *, u_char *, int));
-void	mopPrintMopHeader __P((FILE *, u_char *, int));
-void	mopPrintDevice    __P((FILE *, u_char));
-void	mopPrintTime      __P((FILE *, u_char *));
+void	mopPrintHWA(FILE *, u_char *);
+void	mopPrintBPTY(FILE *, u_char);
+void	mopPrintPGTY(FILE *, u_char);
+void	mopPrintOneline(FILE *, u_char *, int);
+void	mopPrintHeader(FILE *, u_char *, int);
+void	mopPrintMopHeader(FILE *, u_char *, int);
+void	mopPrintDevice(FILE *, u_char);
+void	mopPrintTime(FILE *, u_char *);
 void	mopPrintInfo      __P((FILE *, u_char *, int *, u_short,
 			       u_char, int));
 __END_DECLS
diff --git a/usr.sbin/mopd/common/put.h b/usr.sbin/mopd/common/put.h
index 4d3a08c0186..34d9b34e9ab 100644
--- a/usr.sbin/mopd/common/put.h
+++ b/usr.sbin/mopd/common/put.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: put.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: put.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: put.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: put.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -45,13 +45,13 @@ void	mopPutHeader (/* u_char *, int *, u_char *, u_char *, u_short, int */);
 void	mopPutLength (/* u_char *, int, u_short */);
 #else
 __BEGIN_DECLS
-void	mopPutChar   __P((u_char *, int *, u_char));
-void	mopPutShort  __P((u_char *, int *, u_short));
-void	mopPutLong   __P((u_char *, int *, u_long));
-void	mopPutMulti  __P((u_char *, int *, u_char *, int));
-void	mopPutTime   __P((u_char *, int *, time_t));
-void	mopPutHeader __P((u_char *, int *, u_char *, u_char *, u_short, int));
-void	mopPutLength __P((u_char *, int, u_short));
+void	mopPutChar(u_char *, int *, u_char);
+void	mopPutShort(u_char *, int *, u_short);
+void	mopPutLong(u_char *, int *, u_long);
+void	mopPutMulti(u_char *, int *, u_char *, int);
+void	mopPutTime(u_char *, int *, time_t);
+void	mopPutHeader(u_char *, int *, u_char *, u_char *, u_short, int);
+void	mopPutLength(u_char *, int, u_short);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/rc.h b/usr.sbin/mopd/common/rc.h
index 4a0cf294e89..e168d7dc44a 100644
--- a/usr.sbin/mopd/common/rc.h
+++ b/usr.sbin/mopd/common/rc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rc.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: rc.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: rc.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: rc.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -39,7 +39,7 @@
 void	mopDumpRC        (/* FILE *, u_char *, int */);
 #else
 __BEGIN_DECLS
-void	mopDumpRC        __P((FILE *, u_char *, int));
+void	mopDumpRC(FILE *, u_char *, int);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/mopchk/mopchk.c b/usr.sbin/mopd/mopchk/mopchk.c
index 0c1bb020131..f26f19afd59 100644
--- a/usr.sbin/mopd/mopchk/mopchk.c
+++ b/usr.sbin/mopd/mopchk/mopchk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopchk.c,v 1.5 2001/11/16 21:18:06 miod Exp $	*/
+/*	$OpenBSD: mopchk.c,v 1.6 2002/02/16 21:28:04 millert Exp $	*/
 
 /*
  * Copyright (c) 1995-96 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: mopchk.c,v 1.5 2001/11/16 21:18:06 miod Exp $";
+static char rcsid[] = "$OpenBSD: mopchk.c,v 1.6 2002/02/16 21:28:04 millert Exp $";
 #endif
 
 /*
@@ -56,8 +56,8 @@ struct if_info *iflist;
 void   Usage         (/* void */);
 void   mopProcess    (/* struct if_info *, u_char * */);
 #else
-void   Usage         __P((void));
-void   mopProcess    __P((struct if_info *, u_char *));
+void   Usage(void);
+void   mopProcess(struct if_info *, u_char *);
 #endif
 
 int     AllFlag = 0;		/* listen on "all" interfaces  */
diff --git a/usr.sbin/mopd/mopd/mopd.c b/usr.sbin/mopd/mopd/mopd.c
index 4fd2af0baeb..1988707b45a 100644
--- a/usr.sbin/mopd/mopd/mopd.c
+++ b/usr.sbin/mopd/mopd/mopd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopd.c,v 1.4 1998/03/04 20:21:59 deraadt Exp $ */
+/*	$OpenBSD: mopd.c,v 1.5 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: mopd.c,v 1.4 1998/03/04 20:21:59 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mopd.c,v 1.5 2002/02/16 21:28:04 millert Exp $";
 #endif
 
 /*
@@ -63,9 +63,9 @@ void   Loop	     (/* void */);
 void   Usage         (/* void */);
 void   mopProcess    (/* struct if_info *, u_char * */);
 #else
-void   Loop	     __P((void));
-void   Usage         __P((void));
-void   mopProcess    __P((struct if_info *, u_char *));
+void   Loop(void);
+void   Usage(void);
+void   mopProcess(struct if_info *, u_char *);
 #endif
 
 int     AllFlag = 0;		/* listen on "all" interfaces */
diff --git a/usr.sbin/mopd/mopprobe/mopprobe.c b/usr.sbin/mopd/mopprobe/mopprobe.c
index ae3b6430705..1f0c020dd85 100644
--- a/usr.sbin/mopd/mopprobe/mopprobe.c
+++ b/usr.sbin/mopd/mopprobe/mopprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopprobe.c,v 1.5 1999/03/27 14:31:22 maja Exp $ */
+/*	$OpenBSD: mopprobe.c,v 1.6 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: mopprobe.c,v 1.5 1999/03/27 14:31:22 maja Exp $";
+static char rcsid[] = "$OpenBSD: mopprobe.c,v 1.6 2002/02/16 21:28:04 millert Exp $";
 #endif
 
 /*
@@ -61,9 +61,9 @@ void   Loop	     (/* void */);
 void   Usage         (/* void */);
 void   mopProcess    (/* struct if_info *, u_char * */);
 #else
-void   Loop	     __P((void));
-void   Usage         __P((void));
-void   mopProcess    __P((struct if_info *, u_char *));
+void   Loop(void);
+void   Usage(void);
+void   mopProcess(struct if_info *, u_char *);
 #endif
 
 struct once {
diff --git a/usr.sbin/mopd/moptrace/moptrace.c b/usr.sbin/mopd/moptrace/moptrace.c
index 880ceef3dd4..bd394e154ba 100644
--- a/usr.sbin/mopd/moptrace/moptrace.c
+++ b/usr.sbin/mopd/moptrace/moptrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: moptrace.c,v 1.4 1998/03/19 07:40:13 deraadt Exp $ */
+/*	$OpenBSD: moptrace.c,v 1.5 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: moptrace.c,v 1.4 1998/03/19 07:40:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: moptrace.c,v 1.5 2002/02/16 21:28:04 millert Exp $";
 #endif
 
 /*
@@ -61,9 +61,9 @@ void   Loop	     (/* void */);
 void   Usage         (/* void */);
 void   mopProcess    (/* struct if_info *, u_char * */);
 #else
-void   Loop	     __P((void));
-void   Usage         __P((void));
-void   mopProcess    __P((struct if_info *, u_char *));
+void   Loop(void);
+void   Usage(void);
+void   mopProcess(struct if_info *, u_char *);
 #endif
 
 int     AllFlag = 0;		/* listen on "all" interfaces  */
diff --git a/usr.sbin/mopd/otherOS/loop-linux2.c b/usr.sbin/mopd/otherOS/loop-linux2.c
index d726211726b..62b500f71ea 100644
--- a/usr.sbin/mopd/otherOS/loop-linux2.c
+++ b/usr.sbin/mopd/otherOS/loop-linux2.c
@@ -28,7 +28,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: loop-linux2.c,v 1.1 1999/03/27 14:31:22 maja Exp $";
+static char rcsid[] = "$Id: loop-linux2.c,v 1.2 2002/02/16 21:28:04 millert Exp $";
 #endif
 
 #include <stdlib.h>
@@ -90,7 +90,7 @@ mopReadDL()
  */
 struct if_info *iflist;
 
-void   mopProcess    __P((struct if_info *, u_char *));
+void   mopProcess(struct if_info *, u_char *);
 
 /*
  * Loop indefinitely listening for MOP requests on the
diff --git a/usr.sbin/mrinfo/mrinfo.c b/usr.sbin/mrinfo/mrinfo.c
index 1bfa27e267b..7f6e6c8480e 100644
--- a/usr.sbin/mrinfo/mrinfo.c
+++ b/usr.sbin/mrinfo/mrinfo.c
@@ -105,16 +105,16 @@ int	target_level = 0;
 vifi_t  numvifs;		/* to keep loader happy */
 				/* (see COPY_TABLES macro called in kern.c) */
 
-char *			inet_name __P((u_int32_t addr));
-void			ask __P((u_int32_t dst));
-void			ask2 __P((u_int32_t dst));
+char *			inet_name(u_int32_t addr);
+void			ask(u_int32_t dst);
+void			ask2(u_int32_t dst);
 int			get_number __P((int *var, int deflt, char ***pargv,
 					int *pargc));
-u_int32_t			host_addr __P((char *name));
-void			usage __P((void));
+u_int32_t			host_addr(char *name);
+void			usage(void);
 
 /* to shut up -Wstrict-prototypes */
-int			main __P((int argc, char *argv[]));
+int			main(int argc, char *argv[]);
 
 
 char   *
diff --git a/usr.sbin/mrouted/callout.c b/usr.sbin/mrouted/callout.c
index 9c3acf02202..38fe5c11f28 100644
--- a/usr.sbin/mrouted/callout.c
+++ b/usr.sbin/mrouted/callout.c
@@ -26,7 +26,7 @@ struct timeout_q {
 };
 
 #ifdef IGMP_DEBUG
-static void print_Q __P((void));
+static void print_Q(void);
 #else
 #define	print_Q()	
 #endif
diff --git a/usr.sbin/mrouted/cfparse.y b/usr.sbin/mrouted/cfparse.y
index 0ac0123b8e9..4dbeae54eff 100644
--- a/usr.sbin/mrouted/cfparse.y
+++ b/usr.sbin/mrouted/cfparse.y
@@ -35,14 +35,14 @@
 /*
  * Local function declarations
  */
-static void		fatal __P((char *fmt, ...));
-static void		warn __P((char *fmt, ...));
-static void		yyerror __P((char *s));
-static char *		next_word __P((void));
-static int		yylex __P((void));
-static u_int32_t	valid_if __P((char *s));
-static struct ifreq *	ifconfaddr __P((struct ifconf *ifcp, u_int32_t a));
-int			yyparse __P((void));
+static void		fatal(char *fmt, ...);
+static void		warn(char *fmt, ...);
+static void		yyerror(char *s);
+static char *		next_word(void);
+static int		yylex(void);
+static u_int32_t	valid_if(char *s);
+static struct ifreq *	ifconfaddr(struct ifconf *ifcp, u_int32_t a);
+int			yyparse(void);
 
 static FILE *f;
 
diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h
index 27172d990be..666e11a561e 100644
--- a/usr.sbin/mrouted/defs.h
+++ b/usr.sbin/mrouted/defs.h
@@ -44,8 +44,8 @@
 #endif
 #endif
 
-typedef void (*cfunc_t) __P((void *));
-typedef void (*ihfunc_t) __P((int, fd_set *));
+typedef void (*cfunc_t)(void *);
+typedef void (*ihfunc_t)(int, fd_set *);
 
 #include "dvmrp.h"
 #include "vif.h"
@@ -161,66 +161,66 @@ extern char *		sys_errlist[];
 #endif
 
 /* main.c */
-extern void		log __P((int, int, char *, ...));
-extern int		register_input_handler __P((int fd, ihfunc_t func));
+extern void		log(int, int, char *, ...);
+extern int		register_input_handler(int fd, ihfunc_t func);
 
 /* igmp.c */
-extern void		init_igmp __P((void));
-extern void		accept_igmp __P((int recvlen));
+extern void		init_igmp(void);
+extern void		accept_igmp(int recvlen);
 extern void		send_igmp __P((u_int32_t src, u_int32_t dst, int type,
 						int code, u_int32_t group,
 						int datalen));
 
 /* callout.c */
-extern void		callout_init __P((void));
-extern void		age_callout_queue __P((void));
+extern void		callout_init(void);
+extern void		age_callout_queue(void);
 extern int		timer_setTimer __P((int delay, cfunc_t action,
 						char *data));
-extern void		timer_clearTimer __P((int timer_id));
+extern void		timer_clearTimer(int timer_id);
 
 /* route.c */
-extern void		init_routes __P((void));
-extern void		start_route_updates __P((void));
+extern void		init_routes(void);
+extern void		start_route_updates(void);
 extern void		update_route __P((u_int32_t origin, u_int32_t mask,
 						u_int metric, u_int32_t src,
 						vifi_t vifi));
-extern void		age_routes __P((void));
-extern void		expire_all_routes __P((void));
-extern void		free_all_routes __P((void));
+extern void		age_routes(void);
+extern void		expire_all_routes(void);
+extern void		free_all_routes(void);
 extern void		accept_probe __P((u_int32_t src, u_int32_t dst,
 						char *p, int datalen,
 						u_int32_t level));
 extern void		accept_report __P((u_int32_t src, u_int32_t dst,
 						char *p, int datalen,
 						u_int32_t level));
-extern struct rtentry *	determine_route __P((u_int32_t src));
+extern struct rtentry *	determine_route(u_int32_t src);
 extern void		report __P((int which_routes, vifi_t vifi,
 						u_int32_t dst));
-extern void		report_to_all_neighbors __P((int which_routes));
-extern int		report_next_chunk __P((void));
-extern void		add_vif_to_routes __P((vifi_t vifi));
-extern void		delete_vif_from_routes __P((vifi_t vifi));
+extern void		report_to_all_neighbors(int which_routes);
+extern int		report_next_chunk(void);
+extern void		add_vif_to_routes(vifi_t vifi);
+extern void		delete_vif_from_routes(vifi_t vifi);
 extern void		delete_neighbor_from_routes __P((u_int32_t addr,
 							vifi_t vifi));
-extern void		dump_routes __P((FILE *fp));
-extern void		start_route_updates __P((void));
+extern void		dump_routes(FILE *fp);
+extern void		start_route_updates(void);
 
 /* vif.c */
-extern void		init_vifs __P((void));
-extern void		check_vif_state __P((void));
-extern vifi_t		find_vif __P((u_int32_t src, u_int32_t dst));
-extern void		age_vifs __P((void));
-extern void		dump_vifs __P((FILE *fp));
-extern void		stop_all_vifs __P((void));
-extern struct listaddr *neighbor_info __P((vifi_t vifi, u_int32_t addr));
+extern void		init_vifs(void);
+extern void		check_vif_state(void);
+extern vifi_t		find_vif(u_int32_t src, u_int32_t dst);
+extern void		age_vifs(void);
+extern void		dump_vifs(FILE *fp);
+extern void		stop_all_vifs(void);
+extern struct listaddr *neighbor_info(vifi_t vifi, u_int32_t addr);
 extern void		accept_group_report __P((u_int32_t src, u_int32_t dst,
 					u_int32_t group, int r_type));
-extern void		query_groups __P((void));
-extern void		probe_for_neighbors __P((void));
+extern void		query_groups(void);
+extern void		probe_for_neighbors(void);
 extern int		update_neighbor __P((vifi_t vifi, u_int32_t addr,
 					int msgtype, char *p, int datalen,
 					u_int32_t level));
-extern void		accept_neighbor_request __P((u_int32_t src, u_int32_t dst));
+extern void		accept_neighbor_request(u_int32_t src, u_int32_t dst);
 extern void		accept_neighbor_request2 __P((u_int32_t src,
 					u_int32_t dst));
 extern void		accept_neighbors __P((u_int32_t src, u_int32_t dst,
@@ -233,38 +233,38 @@ extern void		accept_membership_query __P((u_int32_t src, u_int32_t dst,
 					u_int32_t group, int tmo));
 
 /* config.c */
-extern void		config_vifs_from_kernel __P((void));
+extern void		config_vifs_from_kernel(void);
 
 /* cfparse.y */
-extern void		config_vifs_from_file __P((void));
+extern void		config_vifs_from_file(void);
 
 /* inet.c */
-extern int		inet_valid_host __P((u_int32_t naddr));
-extern int		inet_valid_subnet __P((u_int32_t nsubnet, u_int32_t nmask));
-extern char *		inet_fmt __P((u_int32_t addr, char *s));
-extern char *		inet_fmts __P((u_int32_t addr, u_int32_t mask, char *s));
-extern u_int32_t	inet_parse __P((char *s));
-extern int		inet_cksum __P((u_short *addr, u_int len));
+extern int		inet_valid_host(u_int32_t naddr);
+extern int		inet_valid_subnet(u_int32_t nsubnet, u_int32_t nmask);
+extern char *		inet_fmt(u_int32_t addr, char *s);
+extern char *		inet_fmts(u_int32_t addr, u_int32_t mask, char *s);
+extern u_int32_t	inet_parse(char *s);
+extern int		inet_cksum(u_short *addr, u_int len);
 
 /* prune.c */
 extern unsigned		kroutes;
-extern void		add_table_entry __P((u_int32_t origin, u_int32_t mcastgrp));
+extern void		add_table_entry(u_int32_t origin, u_int32_t mcastgrp);
 extern void 		del_table_entry __P((struct rtentry *r,
 					u_int32_t mcastgrp, u_int del_flag));
-extern void		update_table_entry __P((struct rtentry *r));
-extern void		init_ktable __P((void));
+extern void		update_table_entry(struct rtentry *r);
+extern void		init_ktable(void);
 extern void 		accept_prune __P((u_int32_t src, u_int32_t dst, char *p,
 					int datalen));
-extern void		steal_sources __P((struct rtentry *rt));
-extern void		reset_neighbor_state __P((vifi_t vifi, u_int32_t addr));
-extern int		grplst_mem __P((vifi_t vifi, u_int32_t mcastgrp));
-extern int		scoped_addr __P((vifi_t vifi, u_int32_t addr));
-extern void		free_all_prunes __P((void));
-extern void 		age_table_entry __P((void));
-extern void		dump_cache __P((FILE *fp2));
-extern void 		update_lclgrp __P((vifi_t vifi, u_int32_t mcastgrp));
-extern void		delete_lclgrp __P((vifi_t vifi, u_int32_t mcastgrp));
-extern void		chkgrp_graft __P((vifi_t vifi, u_int32_t mcastgrp));
+extern void		steal_sources(struct rtentry *rt);
+extern void		reset_neighbor_state(vifi_t vifi, u_int32_t addr);
+extern int		grplst_mem(vifi_t vifi, u_int32_t mcastgrp);
+extern int		scoped_addr(vifi_t vifi, u_int32_t addr);
+extern void		free_all_prunes(void);
+extern void 		age_table_entry(void);
+extern void		dump_cache(FILE *fp2);
+extern void 		update_lclgrp(vifi_t vifi, u_int32_t mcastgrp);
+extern void		delete_lclgrp(vifi_t vifi, u_int32_t mcastgrp);
+extern void		chkgrp_graft(vifi_t vifi, u_int32_t mcastgrp);
 extern void		accept_graft __P((u_int32_t src, u_int32_t dst, char *p,
 					int datalen));
 extern void 		accept_g_ack __P((u_int32_t src, u_int32_t dst, char *p,
@@ -275,26 +275,26 @@ extern void		accept_mtrace __P((u_int32_t src, u_int32_t dst,
 					int datalen));
 
 /* kern.c */
-extern void		k_set_rcvbuf __P((int bufsize));
-extern void		k_hdr_include __P((int bool));
-extern void		k_set_ttl __P((int t));
-extern void		k_set_loop __P((int l));
-extern void		k_set_if __P((u_int32_t ifa));
-extern void		k_join __P((u_int32_t grp, u_int32_t ifa));
-extern void		k_leave __P((u_int32_t grp, u_int32_t ifa));
-extern void		k_init_dvmrp __P((void));
-extern void		k_stop_dvmrp __P((void));
-extern void		k_add_vif __P((vifi_t vifi, struct uvif *v));
-extern void		k_del_vif __P((vifi_t vifi));
-extern void		k_add_rg __P((u_int32_t origin, struct gtable *g));
-extern int		k_del_rg __P((u_int32_t origin, struct gtable *g));
-extern int		k_get_version __P((void));
+extern void		k_set_rcvbuf(int bufsize);
+extern void		k_hdr_include(int bool);
+extern void		k_set_ttl(int t);
+extern void		k_set_loop(int l);
+extern void		k_set_if(u_int32_t ifa);
+extern void		k_join(u_int32_t grp, u_int32_t ifa);
+extern void		k_leave(u_int32_t grp, u_int32_t ifa);
+extern void		k_init_dvmrp(void);
+extern void		k_stop_dvmrp(void);
+extern void		k_add_vif(vifi_t vifi, struct uvif *v);
+extern void		k_del_vif(vifi_t vifi);
+extern void		k_add_rg(u_int32_t origin, struct gtable *g);
+extern int		k_del_rg(u_int32_t origin, struct gtable *g);
+extern int		k_get_version(void);
 
 #ifdef SNMP
 /* prune.c */
-extern struct rtentry * snmp_find_route __P(());
-extern struct gtable *	find_grp __P(());
-extern struct stable *	find_grp_src __P(());
+extern struct rtentry * snmp_find_route();
+extern struct gtable *	find_grp();
+extern struct stable *	find_grp_src();
 #endif
 
 #ifdef RSRR
@@ -305,9 +305,9 @@ extern int		find_src_grp __P((u_int32_t src, u_int32_t mask,
 					u_int32_t grp));
 
 /* rsrr.c */
-extern void		rsrr_init __P((void));
-extern void		rsrr_read __P((int f, fd_set *rfd));
-extern void		rsrr_clean __P((void));
-extern void		rsrr_cache_send __P((struct gtable *gt, int notify));
-extern void		rsrr_cache_clean __P((struct gtable *gt));
+extern void		rsrr_init(void);
+extern void		rsrr_read(int f, fd_set *rfd);
+extern void		rsrr_clean(void);
+extern void		rsrr_cache_send(struct gtable *gt, int notify);
+extern void		rsrr_cache_clean(struct gtable *gt);
 #endif /* RSRR */
diff --git a/usr.sbin/mrouted/igmp.c b/usr.sbin/mrouted/igmp.c
index 5ac21537f4c..c966fa2620c 100644
--- a/usr.sbin/mrouted/igmp.c
+++ b/usr.sbin/mrouted/igmp.c
@@ -28,8 +28,8 @@ u_int32_t	dvmrp_genid;		     /* IGMP generation id          */
  * Local function definitions.
  */
 /* u_char promoted to u_int */
-static char *	packet_kind __P((u_int type, u_int code));
-static int	igmp_log_level __P((u_int type, u_int code));
+static char *	packet_kind(u_int type, u_int code);
+static int	igmp_log_level(u_int type, u_int code);
 
 /*
  * Open and initialize the igmp socket, and fill in the non-changing
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index 536518f5831..756a35cfe9e 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char rcsid[] =
-	"@(#) $Id: main.c,v 1.7 2001/12/01 23:27:23 miod Exp $";
+	"@(#) $Id: main.c,v 1.8 2002/02/16 21:28:05 millert Exp $";
 #endif
 
 extern char *configfilename;
@@ -65,18 +65,18 @@ static int nhandlers = 0;
 /*
  * Forward declarations.
  */
-static void fasttimer __P((int));
-static void done __P((int));
-static void dump __P((int));
-static void fdump __P((int));
-static void cdump __P((int));
-static void restart __P((int));
-static void timer __P((void));
-static void cleanup __P((void));
-static void resetlogging __P((void *));
+static void fasttimer(int);
+static void done(int);
+static void dump(int);
+static void fdump(int);
+static void cdump(int);
+static void restart(int);
+static void timer(void);
+static void cleanup(void);
+static void resetlogging(void *);
 
 /* To shut up gcc -Wstrict-prototypes */
-int main __P((int argc, char **argv));
+int main(int argc, char **argv);
 
 int
 register_input_handler(fd, func)
diff --git a/usr.sbin/mrouted/prune.c b/usr.sbin/mrouted/prune.c
index de62b4b83e9..cd79b73fe2c 100644
--- a/usr.sbin/mrouted/prune.c
+++ b/usr.sbin/mrouted/prune.c
@@ -50,17 +50,17 @@ unsigned int kroutes;			/* current number of cache entries  */
 /****************************************************************************
                        Functions that are local to prune.c
 ****************************************************************************/
-static void		prun_add_ttls __P((struct gtable *gt));
-static int		pruning_neighbor __P((vifi_t vifi, u_int32_t addr));
-static int		can_mtrace __P((vifi_t vifi, u_int32_t addr));
-static struct ptable *	find_prune_entry __P((u_int32_t vr, struct ptable *pt));
-static void		expire_prune __P((vifi_t vifi, struct gtable *gt));
-static void		send_prune __P((struct gtable *gt));
-static void		send_graft __P((struct gtable *gt));
+static void		prun_add_ttls(struct gtable *gt);
+static int		pruning_neighbor(vifi_t vifi, u_int32_t addr);
+static int		can_mtrace(vifi_t vifi, u_int32_t addr);
+static struct ptable *	find_prune_entry(u_int32_t vr, struct ptable *pt);
+static void		expire_prune(vifi_t vifi, struct gtable *gt);
+static void		send_prune(struct gtable *gt);
+static void		send_graft(struct gtable *gt);
 static void		send_graft_ack __P((u_int32_t src, u_int32_t dst,
 					u_int32_t origin, u_int32_t grp));
-static void		update_kernel __P((struct gtable *g));
-static char *		scaletime __P((u_long t));
+static void		update_kernel(struct gtable *g);
+static char *		scaletime(u_long t);
 
 /* 
  * Updates the ttl values for each vif.
diff --git a/usr.sbin/mrouted/route.c b/usr.sbin/mrouted/route.c
index 6765ae95548..7657cdd25ef 100644
--- a/usr.sbin/mrouted/route.c
+++ b/usr.sbin/mrouted/route.c
@@ -42,10 +42,10 @@ unsigned int nroutes;			/* current number of route entries  */
  */
 static int init_children_and_leaves	__P((struct rtentry *r,
 						vifi_t parent));
-static int find_route		__P((u_int32_t origin, u_int32_t mask));
-static void create_route	__P((u_int32_t origin, u_int32_t mask));
-static void discard_route	__P((struct rtentry *prev_r));
-static int compare_rts		__P((const void *rt1, const void *rt2));
+static int find_route(u_int32_t origin, u_int32_t mask);
+static void create_route(u_int32_t origin, u_int32_t mask);
+static void discard_route(struct rtentry *prev_r);
+static int compare_rts(const void *rt1, const void *rt2);
 static int report_chunk		__P((struct rtentry *start_rt, vifi_t vifi,
 						u_int32_t dst));
 
diff --git a/usr.sbin/mrouted/rsrr.c b/usr.sbin/mrouted/rsrr.c
index 0b736b8aa33..017dc152d19 100644
--- a/usr.sbin/mrouted/rsrr.c
+++ b/usr.sbin/mrouted/rsrr.c
@@ -74,11 +74,11 @@ int client_length = sizeof(client_addr);
 /*
  * Procedure definitions needed internally.
  */
-static void	rsrr_accept __P((int recvlen));
-static void	rsrr_accept_iq __P((void));
+static void	rsrr_accept(int recvlen);
+static void	rsrr_accept_iq(void);
 static int	rsrr_accept_rq __P((struct rsrr_rq *route_query, int flags,
 					struct gtable *gt_notify));
-static int	rsrr_send __P((int sendlen));
+static int	rsrr_send(int sendlen);
 static void	rsrr_cache __P((struct gtable *gt,
 					struct rsrr_rq *route_query));
 
diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c
index 326d17dcd67..ea84bc76629 100644
--- a/usr.sbin/mrouted/vif.c
+++ b/usr.sbin/mrouted/vif.c
@@ -35,16 +35,16 @@ typedef struct {
 /*
  * Forward declarations.
  */
-static void start_vif __P((vifi_t vifi));
-static void start_vif2 __P((vifi_t vifi));
-static void stop_vif __P((vifi_t vifi));
-static void age_old_hosts __P((void));
-static void send_probe_on_vif __P((struct uvif *v));
-static int info_version __P((char *p));
-static void DelVif __P((void *arg));
-static int SetTimer __P((int vifi, struct listaddr *g));
-static int DeleteTimer __P((int id));
-static void SendQuery __P((void *arg));
+static void start_vif(vifi_t vifi);
+static void start_vif2(vifi_t vifi);
+static void stop_vif(vifi_t vifi);
+static void age_old_hosts(void);
+static void send_probe_on_vif(struct uvif *v);
+static int info_version(char *p);
+static void DelVif(void *arg);
+static int SetTimer(int vifi, struct listaddr *g);
+static int DeleteTimer(int id);
+static void SendQuery(void *arg);
 static int SetQueryTimer __P((struct listaddr *g, vifi_t vifi, int to_expire,
 					int q_time));
 
diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c
index a62efd2932f..81d76614a44 100644
--- a/usr.sbin/mtrace/mtrace.c
+++ b/usr.sbin/mtrace/mtrace.c
@@ -52,7 +52,7 @@
 
 #ifndef lint
 static char rcsid[] =
-    "@(#) $Id: mtrace.c,v 1.9 2001/12/10 20:30:46 deraadt Exp $";
+    "@(#) $Id: mtrace.c,v 1.10 2002/02/16 21:28:05 millert Exp $";
 #endif
 
 #include <netdb.h>
@@ -139,23 +139,23 @@ extern long random();
 #endif
 extern int errno;
 
-char *			inet_name __P((u_int32_t addr));
-u_int32_t			host_addr __P((char *name));
+char *			inet_name(u_int32_t addr);
+u_int32_t			host_addr(char *name);
 /* u_int is promoted u_char */
-char *			proto_type __P((u_int type));
-char *			flag_type __P((u_int type));
+char *			proto_type(u_int type);
+char *			flag_type(u_int type);
 
-u_int32_t			get_netmask __P((int s, u_int32_t dst));
-int			get_ttl __P((struct resp_buf *buf));
-int			t_diff __P((u_long a, u_long b));
-u_long			fixtime __P((u_long time));
+u_int32_t			get_netmask(int s, u_int32_t dst);
+int			get_ttl(struct resp_buf *buf);
+int			t_diff(u_long a, u_long b);
+u_long			fixtime(u_long time);
 int			send_recv __P((u_int32_t dst, int type, int code,
 					int tries, struct resp_buf *save));
-char *			print_host __P((u_int32_t addr));
-char *			print_host2 __P((u_int32_t addr1, u_int32_t addr2));
-void			print_trace __P((int index, struct resp_buf *buf));
-int			what_kind __P((struct resp_buf *buf, char *why));
-char *			scale __P((int *hop));
+char *			print_host(u_int32_t addr);
+char *			print_host2(u_int32_t addr1, u_int32_t addr2);
+void			print_trace(int index, struct resp_buf *buf);
+int			what_kind(struct resp_buf *buf, char *why);
+char *			scale(int *hop);
 void			stat_line __P((struct tr_resp *r, struct tr_resp *s,
 					int have_next, int *res));
 void			fixup_stats __P((struct resp_buf *base,
@@ -164,9 +164,9 @@ void			fixup_stats __P((struct resp_buf *base,
 int			print_stats __P((struct resp_buf *base,
 					struct resp_buf *prev,
 					struct resp_buf *new));
-void			check_vif_state __P((void));
+void			check_vif_state(void);
 
-int			main __P((int argc, char *argv[]));
+int			main(int argc, char *argv[]);
 
 
 
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 6a0d5981375..4ef751fa23b 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: compare.c,v 1.11 1996/09/05 09:56:48 mycroft Exp $	*/
-/*	$OpenBSD: compare.c,v 1.13 2001/10/01 16:48:18 jakob Exp $	*/
+/*	$OpenBSD: compare.c,v 1.14 2002/02/16 21:28:05 millert Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
 #if 0
 static const char sccsid[] = "@(#)compare.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: compare.c,v 1.13 2001/10/01 16:48:18 jakob Exp $";
+static const char rcsid[] = "$OpenBSD: compare.c,v 1.14 2002/02/16 21:28:05 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -58,7 +58,7 @@ static const char rcsid[] = "$OpenBSD: compare.c,v 1.13 2001/10/01 16:48:18 jako
 
 extern int lflag, tflag, uflag;
 
-static char *ftype __P((u_int));
+static char *ftype(u_int);
 
 #define	INDENTNAMELEN	8
 #define	LABEL \
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index 2c6b5493643..8160a844997 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: create.c,v 1.11 1996/09/05 09:24:19 mycroft Exp $	*/
-/*	$OpenBSD: create.c,v 1.13 2001/08/10 02:37:14 millert Exp $	*/
+/*	$OpenBSD: create.c,v 1.14 2002/02/16 21:28:05 millert Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
 #if 0
 static const char sccsid[] = "@(#)create.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: create.c,v 1.13 2001/08/10 02:37:14 millert Exp $";
+static const char rcsid[] = "$OpenBSD: create.c,v 1.14 2002/02/16 21:28:05 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -72,10 +72,10 @@ static gid_t gid;
 static uid_t uid;
 static mode_t mode;
 
-static int	dsort __P((const FTSENT **, const FTSENT **));
-static void	output __P((int, int *, const char *, ...));
-static int	statd __P((FTS *, FTSENT *, uid_t *, gid_t *, mode_t *));
-static void	statf __P((int, FTSENT *));
+static int	dsort(const FTSENT **, const FTSENT **);
+static void	output(int, int *, const char *, ...);
+static int	statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *);
+static void	statf(int, FTSENT *);
 
 void
 cwalk()
diff --git a/usr.sbin/mtree/extern.h b/usr.sbin/mtree/extern.h
index eea6c805b73..44289d80141 100644
--- a/usr.sbin/mtree/extern.h
+++ b/usr.sbin/mtree/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.3 1997/07/18 05:49:03 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.4 2002/02/16 21:28:05 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.3 1995/03/07 21:12:07 cgd Exp $	*/
 
 /*-
@@ -36,12 +36,12 @@
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
  */
 
-int	 compare __P((char *, NODE *, FTSENT *));
-int	 crc __P((int, u_int32_t *, u_int32_t *));
-void	 cwalk __P((void));
-void	 error __P((const char *, ...));
-char	*inotype __P((u_int));
-u_int	 parsekey __P((char *, int *));
-char	*rlink __P((char *));
-NODE	*spec __P((void));
-int	 verify __P((void));
+int	 compare(char *, NODE *, FTSENT *);
+int	 crc(int, u_int32_t *, u_int32_t *);
+void	 cwalk(void);
+void	 error(const char *, ...);
+char	*inotype(u_int);
+u_int	 parsekey(char *, int *);
+char	*rlink(char *);
+NODE	*spec(void);
+int	 verify(void);
diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c
index 2a033f7aace..32c2ab6907b 100644
--- a/usr.sbin/mtree/misc.c
+++ b/usr.sbin/mtree/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.9 2001/08/10 02:33:46 millert Exp $	*/
+/*	$OpenBSD: misc.c,v 1.10 2002/02/16 21:28:05 millert Exp $	*/
 /*	$NetBSD: misc.c,v 1.4 1995/03/07 21:26:23 cgd Exp $	*/
 
 /*-
@@ -80,7 +80,7 @@ parsekey(name, needvaluep)
 	int *needvaluep;
 {
 	KEY *k, tmp;
-	int keycompare __P((const void *, const void *));
+	int keycompare(const void *, const void *);
 
 	tmp.name = name;
 	k = (KEY *)bsearch(&tmp, keylist, sizeof(keylist) / sizeof(KEY),
diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c
index 2d4f631536e..48be9f6ce9c 100644
--- a/usr.sbin/mtree/mtree.c
+++ b/usr.sbin/mtree/mtree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtree.c,v 1.13 2001/10/01 16:48:19 jakob Exp $	*/
+/*	$OpenBSD: mtree.c,v 1.14 2002/02/16 21:28:05 millert Exp $	*/
 /*	$NetBSD: mtree.c,v 1.7 1996/09/05 23:29:22 thorpej Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)mtree.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: mtree.c,v 1.13 2001/10/01 16:48:19 jakob Exp $";
+static const char rcsid[] = "$OpenBSD: mtree.c,v 1.14 2002/02/16 21:28:05 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -65,7 +65,7 @@ int cflag, dflag, eflag, iflag, lflag, nflag, qflag, rflag, sflag, tflag,
 u_int keys;
 char fullpath[MAXPATHLEN];
 
-static void usage __P((void));
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c
index 0c6960de39c..52217c89fc8 100644
--- a/usr.sbin/mtree/spec.c
+++ b/usr.sbin/mtree/spec.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: spec.c,v 1.6 1995/03/07 21:12:12 cgd Exp $	*/
-/*	$OpenBSD: spec.c,v 1.12 2001/08/10 02:37:14 millert Exp $	*/
+/*	$OpenBSD: spec.c,v 1.13 2002/02/16 21:28:05 millert Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
 #if 0
 static const char sccsid[] = "@(#)spec.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: spec.c,v 1.12 2001/08/10 02:37:14 millert Exp $";
+static const char rcsid[] = "$OpenBSD: spec.c,v 1.13 2002/02/16 21:28:05 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -56,8 +56,8 @@ static const char rcsid[] = "$OpenBSD: spec.c,v 1.12 2001/08/10 02:37:14 millert
 
 int lineno;				/* Current spec line number. */
 
-static void	 set __P((char *, NODE *));
-static void	 unset __P((char *, NODE *));
+static void	 set(char *, NODE *);
+static void	 unset(char *, NODE *);
 
 NODE *
 spec()
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index f1f1b36e43f..a29484b927b 100644
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: verify.c,v 1.7 2001/08/10 02:37:14 millert Exp $	*/
+/*	$OpenBSD: verify.c,v 1.8 2002/02/16 21:28:05 millert Exp $	*/
 /*	$NetBSD: verify.c,v 1.10 1995/03/07 21:26:28 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static const char sccsid[] = "@(#)verify.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: verify.c,v 1.7 2001/08/10 02:37:14 millert Exp $";
+static const char rcsid[] = "$OpenBSD: verify.c,v 1.8 2002/02/16 21:28:05 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -61,8 +61,8 @@ extern char fullpath[MAXPATHLEN];
 static NODE *root;
 static char path[MAXPATHLEN];
 
-static void	miss __P((NODE *, char *));
-static int	vwalk __P((void));
+static void	miss(NODE *, char *);
+static int	vwalk(void);
 
 int
 verify()
diff --git a/usr.sbin/named/conf/portability.h b/usr.sbin/named/conf/portability.h
index 7ae3e2957bc..7d4ad88e1f9 100644
--- a/usr.sbin/named/conf/portability.h
+++ b/usr.sbin/named/conf/portability.h
@@ -286,9 +286,9 @@ struct timezoneBSD {
 # endif
 
 # ifndef NeXT
-extern char *getenv __P((char *));
+extern char *getenv(char *);
 # else
-extern char *getenv __P((const char *));
+extern char *getenv(const char *);
 # endif
 
 # if !defined(DMALLOC) && !defined(NeXT)
@@ -309,9 +309,9 @@ extern void free();
 # define STDERR_FILENO	2
 extern int errno;
 
-extern int getdtablesize __P((void));
+extern int getdtablesize(void);
 # ifdef SHORT_FNAMES
-extern long pathconf __P((const char *path, int name));
+extern long pathconf(const char *path, int name);
 # endif
 
 #endif /*USE_POSIX*/
@@ -351,7 +351,7 @@ extern long pathconf __P((const char *path, int name));
 #endif
 
 #if !defined(__convex__) && (!defined(BSD) || (BSD < 199103))
-int      strcasecmp __P((const char *, const char *));
+int      strcasecmp(const char *, const char *);
 #endif
 
 /* is USE_POSIX the right thing to use here? */
@@ -362,7 +362,7 @@ int      strcasecmp __P((const char *, const char *));
 # if !defined(NCR)
 extern void	syslog();
 # endif
-extern char	*ctime __P((const time_t *clock));
+extern char	*ctime(const time_t *clock);
 # if !defined(M_UNIX)
 extern int	close(), setitimer(), recv(), sendto(), sigsetmask(),
 		atoi(), getpid(), fork(), read(), ioctl(),
@@ -455,8 +455,8 @@ extern int bcmp();
 
 #if !defined(ntohl) && !defined(htonl) && defined(BSD) && (BSD <= 43)
 /* if these aren't null macros in netinet/in.h, extern them here. */
-extern u_short htons __P((u_short)), ntohs __P((u_short));
-extern u_long htonl __P((u_long)), ntohl __P((u_long));
+extern u_short htons(u_short), ntohs(u_short);
+extern u_long htonl(u_long), ntohl(u_long);
 #endif
 
 #if defined(USE_POSIX) && !defined(sun) && !defined(__sgi) \
@@ -632,19 +632,19 @@ extern u_long htonl __P((u_long)), ntohl __P((u_long));
  * Prototype the functions we'll be supplying.
  */
 #ifdef NEED_PUTENV
-extern int putenv __P((char *));
+extern int putenv(char *);
 #endif
 
 #ifdef NEED_GETTIMEOFDAY
-extern int gettimeofday __P((struct timeval *, struct _TIMEZONE *));
+extern int gettimeofday(struct timeval *, struct _TIMEZONE *);
 #endif
 
 #if defined(SVR4) && defined(sun)
-extern int gethostname __P((char *, size_t));
+extern int gethostname(char *, size_t);
 #endif
 
 #ifdef NEED_STRDUP
-extern char *strdup __P((const char *));
+extern char *strdup(const char *);
 #endif
 
 #endif /*__BIND_PORTABILITY_H*/
diff --git a/usr.sbin/named/include/arpa/inet.h b/usr.sbin/named/include/arpa/inet.h
index 71ae3b59117..dc9864e54c7 100644
--- a/usr.sbin/named/include/arpa/inet.h
+++ b/usr.sbin/named/include/arpa/inet.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet.h,v 1.2 1997/03/12 11:21:16 downsj Exp $	*/
+/*	$OpenBSD: inet.h,v 1.3 2002/02/16 21:28:05 millert Exp $	*/
 
 /*
  * ++Copyright++ 1983, 1993
@@ -74,20 +74,20 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-unsigned long	 inet_addr __P((const char *));
-int		 inet_aton __P((const char *, struct in_addr *));
-unsigned long	 inet_lnaof __P((struct in_addr));
-struct in_addr	 inet_makeaddr __P((u_long , u_long));
-char *		 inet_neta __P((u_long, char *, size_t));
-unsigned long	 inet_netof __P((struct in_addr));
-unsigned long	 inet_network __P((const char *));
-char		*inet_net_ntop __P((int, const void *, int, char *, size_t));
-int		 inet_net_pton __P((int, const char *, void *, size_t));
-char		*inet_ntoa __P((struct in_addr));
-int		 inet_pton __P((int, const char *, void *));
-const char	*inet_ntop __P((int, const void *, char *, size_t));
-u_int		 inet_nsap_addr __P((const char *, u_char *, int));
-char		*inet_nsap_ntoa __P((int, const u_char *, char *));
+unsigned long	 inet_addr(const char *);
+int		 inet_aton(const char *, struct in_addr *);
+unsigned long	 inet_lnaof(struct in_addr);
+struct in_addr	 inet_makeaddr(u_long , u_long);
+char *		 inet_neta(u_long, char *, size_t);
+unsigned long	 inet_netof(struct in_addr);
+unsigned long	 inet_network(const char *);
+char		*inet_net_ntop(int, const void *, int, char *, size_t);
+int		 inet_net_pton(int, const char *, void *, size_t);
+char		*inet_ntoa(struct in_addr);
+int		 inet_pton(int, const char *, void *);
+const char	*inet_ntop(int, const void *, char *, size_t);
+u_int		 inet_nsap_addr(const char *, u_char *, int);
+char		*inet_nsap_ntoa(int, const u_char *, char *);
 __END_DECLS
 
 #endif /* !_INET_H_ */
diff --git a/usr.sbin/named/include/arpa/nameser.h b/usr.sbin/named/include/arpa/nameser.h
index 65a10f4c175..69bf856af7a 100644
--- a/usr.sbin/named/include/arpa/nameser.h
+++ b/usr.sbin/named/include/arpa/nameser.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nameser.h,v 1.2 1997/03/12 11:21:16 downsj Exp $	*/
+/*	$OpenBSD: nameser.h,v 1.3 2002/02/16 21:28:05 millert Exp $	*/
 
 /*
  * ++Copyright++ 1983, 1989, 1993
@@ -346,8 +346,8 @@ typedef struct {
  */
 #define INDIR_MASK	0xc0
 
-extern	u_int16_t	_getshort __P((const u_char *));
-extern	u_int32_t	_getlong __P((const u_char *));
+extern	u_int16_t	_getshort(const u_char *);
+extern	u_int32_t	_getlong(const u_char *);
 
 /*
  * Inline versions of get/put short/long.  Pointer is advanced.
diff --git a/usr.sbin/named/include/netdb.h b/usr.sbin/named/include/netdb.h
index a4d246b1eb3..844bf9255ac 100644
--- a/usr.sbin/named/include/netdb.h
+++ b/usr.sbin/named/include/netdb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netdb.h,v 1.3 1998/05/22 00:47:15 millert Exp $	*/
+/*	$OpenBSD: netdb.h,v 1.4 2002/02/16 21:28:05 millert Exp $	*/
 
 /*
  * ++Copyright++ 1980, 1983, 1988, 1993
@@ -129,30 +129,30 @@ struct	protoent {
 #define	NO_ADDRESS	NO_DATA		/* no address, look for MX record */
 
 __BEGIN_DECLS
-void		endhostent __P((void));
-void		endnetent __P((void));
-void		endprotoent __P((void));
-void		endservent __P((void));
-struct hostent	*gethostbyaddr __P((const char *, int, int));
-struct hostent	*gethostbyname __P((const char *));
-struct hostent	*gethostbyname2 __P((const char *, int));
-struct hostent	*gethostent __P((void));
-struct netent	*getnetbyaddr __P((unsigned long, int));
-struct netent	*getnetbyname __P((const char *));
-struct netent	*getnetent __P((void));
-struct protoent	*getprotobyname __P((const char *));
-struct protoent	*getprotobynumber __P((int));
-struct protoent	*getprotoent __P((void));
-struct servent	*getservbyname __P((const char *, const char *));
-struct servent	*getservbyport __P((int, const char *));
-struct servent	*getservent __P((void));
-void		herror __P((const char *));
-const char	*hstrerror __P((int));
-void		sethostent __P((int));
-/* void		sethostfile __P((const char *)); */
-void		setnetent __P((int));
-void		setprotoent __P((int));
-void		setservent __P((int));
+void		endhostent(void);
+void		endnetent(void);
+void		endprotoent(void);
+void		endservent(void);
+struct hostent	*gethostbyaddr(const char *, int, int);
+struct hostent	*gethostbyname(const char *);
+struct hostent	*gethostbyname2(const char *, int);
+struct hostent	*gethostent(void);
+struct netent	*getnetbyaddr(unsigned long, int);
+struct netent	*getnetbyname(const char *);
+struct netent	*getnetent(void);
+struct protoent	*getprotobyname(const char *);
+struct protoent	*getprotobynumber(int);
+struct protoent	*getprotoent(void);
+struct servent	*getservbyname(const char *, const char *);
+struct servent	*getservbyport(int, const char *);
+struct servent	*getservent(void);
+void		herror(const char *);
+const char	*hstrerror(int);
+void		sethostent(int);
+/* void		sethostfile(const char *); */
+void		setnetent(int);
+void		setprotoent(int);
+void		setservent(int);
 __END_DECLS
 
 /* This is nec'y to make this include file properly replace the sun version. */
diff --git a/usr.sbin/named/include/resolv.h b/usr.sbin/named/include/resolv.h
index f6bdaef9a2a..193c97213af 100644
--- a/usr.sbin/named/include/resolv.h
+++ b/usr.sbin/named/include/resolv.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: resolv.h,v 1.3 1998/05/22 00:47:17 millert Exp $	*/
+/*	$OpenBSD: resolv.h,v 1.4 2002/02/16 21:28:05 millert Exp $	*/
 
 /*
  * ++Copyright++ 1983, 1987, 1989, 1993
@@ -243,56 +243,56 @@ extern const struct res_sym __p_type_syms[];
 #endif
 
 __BEGIN_DECLS
-int		res_hnok __P((const char *));
-int		res_ownok __P((const char *));
-int		res_mailok __P((const char *));
-int		res_dnok __P((const char *));
-int		sym_ston __P((const struct res_sym *, char *, int *));
-const char *	sym_ntos __P((const struct res_sym *, int, int *));
-const char *	sym_ntop __P((const struct res_sym *, int, int *));
-int		b64_ntop __P((u_char const *, size_t, char *, size_t));
-int		b64_pton __P((char const *, u_char *, size_t));
-int		loc_aton __P((const char *, u_char *));
-const char *	loc_ntoa __P((const u_char *, char *));
-int		dn_skipname __P((const u_char *, const u_char *));
-void		fp_resstat __P((struct __res_state *, FILE *));
-void		fp_query __P((const u_char *, FILE *));
-void		fp_nquery __P((const u_char *, int, FILE *));
-const char *	hostalias __P((const char *));
-void		putlong __P((u_int32_t, u_char *));
-void		putshort __P((u_int16_t, u_char *));
-const char *	p_class __P((int));
-const char *	p_time __P((u_int32_t));
-const char *	p_type __P((int));
-void		p_query __P((const u_char *));
-const u_char *	p_cdnname __P((const u_char *, const u_char *, int, FILE *));
-const u_char *	p_cdname __P((const u_char *, const u_char *, FILE *));
+int		res_hnok(const char *);
+int		res_ownok(const char *);
+int		res_mailok(const char *);
+int		res_dnok(const char *);
+int		sym_ston(const struct res_sym *, char *, int *);
+const char *	sym_ntos(const struct res_sym *, int, int *);
+const char *	sym_ntop(const struct res_sym *, int, int *);
+int		b64_ntop(u_char const *, size_t, char *, size_t);
+int		b64_pton(char const *, u_char *, size_t);
+int		loc_aton(const char *, u_char *);
+const char *	loc_ntoa(const u_char *, char *);
+int		dn_skipname(const u_char *, const u_char *);
+void		fp_resstat(struct __res_state *, FILE *);
+void		fp_query(const u_char *, FILE *);
+void		fp_nquery(const u_char *, int, FILE *);
+const char *	hostalias(const char *);
+void		putlong(u_int32_t, u_char *);
+void		putshort(u_int16_t, u_char *);
+const char *	p_class(int);
+const char *	p_time(u_int32_t);
+const char *	p_type(int);
+void		p_query(const u_char *);
+const u_char *	p_cdnname(const u_char *, const u_char *, int, FILE *);
+const u_char *	p_cdname(const u_char *, const u_char *, FILE *);
 const u_char *	p_fqnname __P((const u_char *cp, const u_char *msg,
 			       int, char *, int));
-const u_char *	p_fqname __P((const u_char *, const u_char *, FILE *));
-const u_char *	p_rr __P((const u_char *, const u_char *, FILE *));
-const char *	p_option __P((u_long option));
-char *		p_secstodate __P((u_long));
-int		dn_count_labels __P((char *));
+const u_char *	p_fqname(const u_char *, const u_char *, FILE *);
+const u_char *	p_rr(const u_char *, const u_char *, FILE *);
+const char *	p_option(u_long option);
+char *		p_secstodate(u_long);
+int		dn_count_labels(char *);
 int		dn_comp __P((const char *, u_char *, int,
 			     u_char **, u_char **));
 int		dn_expand __P((const u_char *, const u_char *, const u_char *,
 			       char *, int));
-int		res_init __P((void));
-u_int		res_randomid __P((void));
-int		res_query __P((const char *, int, int, u_char *, int));
-int		res_search __P((const char *, int, int, u_char *, int));
+int		res_init(void);
+u_int		res_randomid(void);
+int		res_query(const char *, int, int, u_char *, int);
+int		res_search(const char *, int, int, u_char *, int);
 int		res_querydomain __P((const char *, const char *, int, int,
 				     u_char *, int));
 int		res_mkquery __P((int, const char *, int, int, const u_char *, int,
 				 const u_char *, u_char *, int));
-int		res_send __P((const u_char *, int, u_char *, int));
-int		res_isourserver __P((const struct sockaddr_in *));
+int		res_send(const u_char *, int, u_char *, int);
+int		res_isourserver(const struct sockaddr_in *);
 int		res_nameinquery __P((const char *, int, int,
 				     const u_char *, const u_char *));
 int		res_queriesmatch __P((const u_char *, const u_char *,
 				      const u_char *, const u_char *));
-void		res_close __P((void));
+void		res_close(void);
 __END_DECLS
 
 #endif /* !_RESOLV_H_ */
diff --git a/usr.sbin/named/libresolv/gethnamaddr.c b/usr.sbin/named/libresolv/gethnamaddr.c
index aaea43549ea..728b68103b5 100644
--- a/usr.sbin/named/libresolv/gethnamaddr.c
+++ b/usr.sbin/named/libresolv/gethnamaddr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gethnamaddr.c,v 1.3 1998/05/22 07:09:07 millert Exp $	*/
+/*	$OpenBSD: gethnamaddr.c,v 1.4 2002/02/16 21:28:05 millert Exp $	*/
 
 /*
  * ++Copyright++ 1985, 1988, 1993
@@ -60,7 +60,7 @@
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "$From: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: gethnamaddr.c,v 1.3 1998/05/22 07:09:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: gethnamaddr.c,v 1.4 2002/02/16 21:28:05 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -116,11 +116,11 @@ static u_char host_addr[16];	/* IPv4 or IPv6 */
 static FILE *hostf = NULL;
 static int stayopen = 0;
 
-static void map_v4v6_address __P((const char *src, char *dst));
-static void map_v4v6_hostent __P((struct hostent *hp, char **bp, int *len));
+static void map_v4v6_address(const char *src, char *dst);
+static void map_v4v6_hostent(struct hostent *hp, char **bp, int *len);
 
 #ifdef RESOLVSORT
-static void addrsort __P((char **, int));
+static void addrsort(char **, int);
 #endif
 
 #if PACKETSZ > 1024
@@ -192,7 +192,7 @@ getanswer(answer, anslen, qname, qtype)
 	int toobig = 0;
 	char tbuf[MAXDNAME];
 	const char *tname;
-	int (*name_ok) __P((const char *));
+	int (*name_ok)(const char *);
 
 	tname = qname;
 	host.h_name = NULL;
diff --git a/usr.sbin/named/libresolv/getnetent.c b/usr.sbin/named/libresolv/getnetent.c
index 96b0e648773..1f567f558e3 100644
--- a/usr.sbin/named/libresolv/getnetent.c
+++ b/usr.sbin/named/libresolv/getnetent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getnetent.c,v 1.2 1998/05/22 00:47:19 millert Exp $	*/
+/*	$OpenBSD: getnetent.c,v 1.3 2002/02/16 21:28:05 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -48,7 +48,7 @@
 static char sccsid[] = "@(#)getnetent.c	8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "$From: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: getnetent.c,v 1.2 1998/05/22 00:47:19 millert Exp $";
+static char rcsid[] = "$OpenBSD: getnetent.c,v 1.3 2002/02/16 21:28:05 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -76,8 +76,8 @@ static struct netent net;
 static char *net_aliases[MAXALIASES];
 int _net_stayopen;
 
-void _setnetent __P((int));
-void _endnetent __P((void));
+void _setnetent(int);
+void _endnetent(void);
 
 void
 setnetent(stayopen)
diff --git a/usr.sbin/named/libresolv/getnetnamadr.c b/usr.sbin/named/libresolv/getnetnamadr.c
index 5ed407d6d5c..59ae82b6e4c 100644
--- a/usr.sbin/named/libresolv/getnetnamadr.c
+++ b/usr.sbin/named/libresolv/getnetnamadr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getnetnamadr.c,v 1.2 1998/05/22 00:47:20 millert Exp $	*/
+/*	$OpenBSD: getnetnamadr.c,v 1.3 2002/02/16 21:28:05 millert Exp $	*/
 
 /* Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
  *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)getnetbyaddr.c	8.1 (Berkeley) 6/4/93";
 static char sccsid_[] = "from getnetnamadr.c	1.4 (Coimbra) 93/06/03";
 static char rcsid[] = "$From: getnetnamadr.c,v 8.8 1997/06/01 20:34:37 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: getnetnamadr.c,v 1.2 1998/05/22 00:47:20 millert Exp $";
+static char rcsid[] = "$OpenBSD: getnetnamadr.c,v 1.3 2002/02/16 21:28:05 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -70,8 +70,8 @@ extern int h_errno;
 extern int errno;
 #endif
 
-struct netent *_getnetbyaddr __P((long net, int type));
-struct netent *_getnetbyname __P((const char *name));
+struct netent *_getnetbyaddr(long net, int type);
+struct netent *_getnetbyname(const char *name);
 
 #define BYADDR 0
 #define BYNAME 1
diff --git a/usr.sbin/named/libresolv/inet_ntop.c b/usr.sbin/named/libresolv/inet_ntop.c
index e3da069e7ef..08488ed1bce 100644
--- a/usr.sbin/named/libresolv/inet_ntop.c
+++ b/usr.sbin/named/libresolv/inet_ntop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet_ntop.c,v 1.1 1997/03/12 10:42:06 downsj Exp $	*/
+/*	$OpenBSD: inet_ntop.c,v 1.2 2002/02/16 21:28:05 millert Exp $	*/
 
 /* Copyright (c) 1996 by Internet Software Consortium.
  *
@@ -20,7 +20,7 @@
 #if 0
 static char rcsid[] = "$From: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.1 1997/03/12 10:42:06 downsj Exp $";
+static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.2 2002/02/16 21:28:05 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -46,8 +46,8 @@ static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.1 1997/03/12 10:42:06 downsj Ex
  * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
  */
 
-static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size));
-static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size));
+static const char *inet_ntop4(const u_char *src, char *dst, size_t size);
+static const char *inet_ntop6(const u_char *src, char *dst, size_t size);
 
 /* char *
  * inet_ntop(af, src, dst, size)
diff --git a/usr.sbin/named/libresolv/inet_pton.c b/usr.sbin/named/libresolv/inet_pton.c
index 035d152770b..078e24c6402 100644
--- a/usr.sbin/named/libresolv/inet_pton.c
+++ b/usr.sbin/named/libresolv/inet_pton.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet_pton.c,v 1.1 1997/03/12 10:42:07 downsj Exp $	*/
+/*	$OpenBSD: inet_pton.c,v 1.2 2002/02/16 21:28:05 millert Exp $	*/
 
 /* Copyright (c) 1996 by Internet Software Consortium.
  *
@@ -20,7 +20,7 @@
 #if 0
 static char rcsid[] = "$From: inet_pton.c,v 8.7 1996/08/05 08:31:35 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: inet_pton.c,v 1.1 1997/03/12 10:42:07 downsj Exp $";
+static char rcsid[] = "$OpenBSD: inet_pton.c,v 1.2 2002/02/16 21:28:05 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -39,8 +39,8 @@ static char rcsid[] = "$OpenBSD: inet_pton.c,v 1.1 1997/03/12 10:42:07 downsj Ex
  * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
  */
 
-static int	inet_pton4 __P((const char *src, u_char *dst));
-static int	inet_pton6 __P((const char *src, u_char *dst));
+static int	inet_pton4(const char *src, u_char *dst);
+static int	inet_pton6(const char *src, u_char *dst);
 
 /* int
  * inet_pton(af, src, dst)
diff --git a/usr.sbin/named/libresolv/res_comp.c b/usr.sbin/named/libresolv/res_comp.c
index 132f99f3b55..9bf9acda04d 100644
--- a/usr.sbin/named/libresolv/res_comp.c
+++ b/usr.sbin/named/libresolv/res_comp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_comp.c,v 1.4 2001/01/28 02:12:49 niklas Exp $	*/
+/*	$OpenBSD: res_comp.c,v 1.5 2002/02/16 21:28:05 millert Exp $	*/
 
 /*
  * ++Copyright++ 1985, 1993
@@ -60,7 +60,7 @@
 static char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "$From: res_comp.c,v 8.14 1998/05/11 04:19:47 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_comp.c,v 1.4 2001/01/28 02:12:49 niklas Exp $";
+static char rcsid[] = "$OpenBSD: res_comp.c,v 1.5 2002/02/16 21:28:05 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -81,8 +81,8 @@ static char rcsid[] = "$OpenBSD: res_comp.c,v 1.4 2001/01/28 02:12:49 niklas Exp
 # include "../conf/portability.h"
 #endif
 
-static int	ns_name_ntop __P((const u_char *, char *, size_t));
-static int	ns_name_pton __P((const char *, u_char *, size_t));
+static int	ns_name_ntop(const u_char *, char *, size_t);
+static int	ns_name_pton(const char *, u_char *, size_t);
 static int	ns_name_unpack __P((const u_char *, const u_char *,
 				    const u_char *, u_char *, size_t));
 static int	ns_name_pack __P((const u_char *, u_char *, int,
@@ -91,7 +91,7 @@ static int	ns_name_uncompress __P((const u_char *, const u_char *,
 					const u_char *, char *, size_t));
 static int	ns_name_compress __P((const char *, u_char *, size_t,
 				      const u_char **, const u_char **));
-static int	ns_name_skip __P((const u_char **, const u_char *));
+static int	ns_name_skip(const u_char **, const u_char *);
 
 /*
  * Expand compressed domain name 'comp_dn' to full domain name.
diff --git a/usr.sbin/named/libresolv/res_init.c b/usr.sbin/named/libresolv/res_init.c
index a8183f6917e..da938536c3f 100644
--- a/usr.sbin/named/libresolv/res_init.c
+++ b/usr.sbin/named/libresolv/res_init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_init.c,v 1.5 2000/11/10 17:25:49 provos Exp $	*/
+/*	$OpenBSD: res_init.c,v 1.6 2002/02/16 21:28:05 millert Exp $	*/
 
 /*
  * ++Copyright++ 1985, 1989, 1993
@@ -60,7 +60,7 @@
 static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
 static char rcsid[] = "$From: res_init.c,v 8.8 1997/06/01 20:34:37 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_init.c,v 1.5 2000/11/10 17:25:49 provos Exp $";
+static char rcsid[] = "$OpenBSD: res_init.c,v 1.6 2002/02/16 21:28:05 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -109,19 +109,19 @@ static char rcsid[] = "$OpenBSD: res_init.c,v 1.5 2000/11/10 17:25:49 provos Exp
 #  include <netinfo/ni.h>
 #  define NI_PATH_RESCONF "/locations/resolver"
 #  define NI_TIMEOUT 10
-static int netinfo_res_init __P((int *haveenv, int *havesearch));
+static int netinfo_res_init(int *haveenv, int *havesearch);
 #endif
 
 #if defined(USE_OPTIONS_H)
 # include "../conf/options.h"
 #endif
 
-static void res_setoptions __P((char *, char *));
+static void res_setoptions(char *, char *);
 
 #ifdef RESOLVSORT
 static const char sort_mask[] = "/&";
 #define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
-static u_int32_t net_mask __P((struct in_addr));
+static u_int32_t net_mask(struct in_addr);
 #endif
 
 #if !defined(isascii)	/* XXX - could be a function */
diff --git a/usr.sbin/named/libresolv/res_query.c b/usr.sbin/named/libresolv/res_query.c
index ad91c0374c2..836cc745c71 100644
--- a/usr.sbin/named/libresolv/res_query.c
+++ b/usr.sbin/named/libresolv/res_query.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_query.c,v 1.3 1998/05/22 00:47:25 millert Exp $	*/
+/*	$OpenBSD: res_query.c,v 1.4 2002/02/16 21:28:05 millert Exp $	*/
 
 /*
  * ++Copyright++ 1988, 1993
@@ -60,7 +60,7 @@
 static char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "$From: res_query.c,v 8.10 1997/06/01 20:34:37 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_query.c,v 1.3 1998/05/22 00:47:25 millert Exp $";
+static char rcsid[] = "$OpenBSD: res_query.c,v 1.4 2002/02/16 21:28:05 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -92,7 +92,7 @@ static char rcsid[] = "$OpenBSD: res_query.c,v 1.3 1998/05/22 00:47:25 millert E
 #define MAXPACKET	1024
 #endif
 
-const char *hostalias __P((const char *));
+const char *hostalias(const char *);
 int h_errno;
 
 /*
diff --git a/usr.sbin/named/named-xfer/named-xfer.c b/usr.sbin/named/named-xfer/named-xfer.c
index 858028dce61..bf365c3786a 100644
--- a/usr.sbin/named/named-xfer/named-xfer.c
+++ b/usr.sbin/named/named-xfer/named-xfer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: named-xfer.c,v 1.8 2001/10/24 13:06:36 mpech Exp $	*/
+/*	$OpenBSD: named-xfer.c,v 1.9 2002/02/16 21:28:06 millert Exp $	*/
 
 /*
  * The original version of xfer by Kevin Dunlap.
@@ -97,7 +97,7 @@ char copyright[] =
 static char sccsid[] = "@(#)named-xfer.c	4.18 (Berkeley) 3/7/91";
 static char rcsid[] = "$From: named-xfer.c,v 8.24 1998/04/07 04:59:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: named-xfer.c,v 1.8 2001/10/24 13:06:36 mpech Exp $";
+static char rcsid[] = "$OpenBSD: named-xfer.c,v 1.9 2002/02/16 21:28:06 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -156,14 +156,14 @@ static	FILE		*fp = NULL,
 
 static	char		*ProgName;
 
-static	void		usage __P((const char *));
-static	int		getzone __P((struct zoneinfo *, u_int32_t, int)),
+static	void		usage(const char *);
+static	int		getzone(struct zoneinfo *, u_int32_t, int),
 			print_output __P((struct zoneinfo *, u_int32_t,
 					  u_char *, int, u_char *)),
-			netread __P((int, char *, int, int));
-static	SIG_FN		read_alarm __P(());
-static	SIG_FN		term_handler __P(());
-static	const char	*soa_zinfo __P((struct zoneinfo *, u_char *, u_char*));
+			netread(int, char *, int, int);
+static	SIG_FN		read_alarm();
+static	SIG_FN		term_handler();
+static	const char	*soa_zinfo(struct zoneinfo *, u_char *, u_char*);
 
 struct zoneinfo zp_start, zp_finish;
 
diff --git a/usr.sbin/named/named/db_dump.c b/usr.sbin/named/named/db_dump.c
index b98310aa7b0..76e9c4fcbf5 100644
--- a/usr.sbin/named/named/db_dump.c
+++ b/usr.sbin/named/named/db_dump.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: db_dump.c,v 1.4 1998/06/23 22:40:36 millert Exp $	*/
+/*	$OpenBSD: db_dump.c,v 1.5 2002/02/16 21:28:06 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)db_dump.c	4.33 (Berkeley) 3/3/91";
 static char rcsid[] = "$From: db_dump.c,v 8.19 1996/10/08 04:51:03 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: db_dump.c,v 1.4 1998/06/23 22:40:36 millert Exp $";
+static char rcsid[] = "$OpenBSD: db_dump.c,v 1.5 2002/02/16 21:28:06 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -101,11 +101,11 @@ static char rcsid[] = "$OpenBSD: db_dump.c,v 1.4 1998/06/23 22:40:36 millert Exp
 
 #include "named.h"
 
-static int		scan_root __P((struct hashbuf *));
-static const char	*MkCredStr __P((int));
+static int		scan_root(struct hashbuf *);
+static const char	*MkCredStr(int);
 
 #ifdef ALLOW_T_UNSPEC
-static void		putbyte __P((int, char **));
+static void		putbyte(int, char **);
 #endif
 
 /*
diff --git a/usr.sbin/named/named/db_func.h b/usr.sbin/named/named/db_func.h
index b0e006a7f1e..f609532a78f 100644
--- a/usr.sbin/named/named/db_func.h
+++ b/usr.sbin/named/named/db_func.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_func.h,v 1.4 1998/05/23 19:24:48 millert Exp $	*/
+/*	$OpenBSD: db_func.h,v 1.5 2002/02/16 21:28:06 millert Exp $	*/
 
 /* db_proc.h - prototypes for functions in db_*.c
  *
@@ -11,37 +11,37 @@ extern int		db_update __P((char name[],
 				       struct databuf *newdp,
 				       int flags,
 				       struct hashbuf *htp)),
-			db_cmp __P((struct databuf *,struct databuf *)),
-			findMyZone __P((struct namebuf *np, int class));
-extern void		fixttl __P((struct databuf *dp));
+			db_cmp(struct databuf *,struct databuf *),
+			findMyZone(struct namebuf *np, int class);
+extern void		fixttl(struct databuf *dp);
 /* --from db_update.c-- */
 
 /* ++from db_reload.c++ */
-extern void		db_reload __P((int));
+extern void		db_reload(int);
 /* --from db_reload.c-- */
 
 /* ++from db_save.c++ */
-extern struct namebuf	*savename __P((const char *, int));
-extern struct databuf	*savedata __P((int, int, u_int32_t, u_char *, int));
-extern struct hashbuf	*savehash __P((struct hashbuf *));
+extern struct namebuf	*savename(const char *, int);
+extern struct databuf	*savedata(int, int, u_int32_t, u_char *, int);
+extern struct hashbuf	*savehash(struct hashbuf *);
 /* --from db_save.c-- */
 
 /* ++from db_dump.c++ */
-extern int		db_dump __P((struct hashbuf *, FILE *, int, char *)),
-			zt_dump __P((FILE *)),
-			atob __P((char *, int, char *, int, int *));
-extern void		doachkpt __P((void)),
-			doadump __P((void));
-extern u_int		db_getclev __P((const char *));
+extern int		db_dump(struct hashbuf *, FILE *, int, char *),
+			zt_dump(FILE *),
+			atob(char *, int, char *, int, int *);
+extern void		doachkpt(void),
+			doadump(void);
+extern u_int		db_getclev(const char *);
 /* --from db_dump.c-- */
 
 /* ++from db_load.c++ */
-extern void		endline __P((FILE *)),
+extern void		endline(FILE *),
 			get_netlist __P((FILE *, struct netinfo **,
 					 int, char *)),
-			free_netlist __P((struct netinfo **));
-extern int		getword __P((char *, int, FILE *, int)),
-			getnum __P((FILE *, const char *, int)),
+			free_netlist(struct netinfo **);
+extern int		getword(char *, int, FILE *, int),
+			getnum(FILE *, const char *, int),
 			db_load __P((const char *, const char *,
 				     struct zoneinfo *, const char *)),
 			position_on_netlist __P((struct in_addr,
@@ -51,28 +51,28 @@ extern struct netinfo	*addr_on_netlist __P((struct in_addr,
 /* --from db_load.c-- */
 
 /* ++from db_glue.c++ */
-extern const char	*sin_ntoa __P((const struct sockaddr_in *));
-extern void		panic __P((int, const char *)),
-			buildservicelist __P((void)),
-			buildprotolist __P((void)),
-			gettime __P((struct timeval *)),
-			getname __P((struct namebuf *, char *, int));
-extern int		servicenumber __P((char *)),
-			protocolnumber __P((char *)),
-			my_close __P((int)),
-			my_fclose __P((FILE *)),
+extern const char	*sin_ntoa(const struct sockaddr_in *);
+extern void		panic(int, const char *),
+			buildservicelist(void),
+			buildprotolist(void),
+			gettime(struct timeval *),
+			getname(struct namebuf *, char *, int);
+extern int		servicenumber(char *),
+			protocolnumber(char *),
+			my_close(int),
+			my_fclose(FILE *),
 #ifdef GEN_AXFR
-			get_class __P((char *)),
+			get_class(char *),
 #endif
-			writemsg __P((int, u_char *, int)),
-			dhash __P((const u_char *, int)),
-			nhash __P((const char *)),
-			samedomain __P((const char *, const char *));
-extern char		*protocolname __P((int)),
-			*servicename __P((u_int16_t, char *)),
-			*savestr __P((const char *));
+			writemsg(int, u_char *, int),
+			dhash(const u_char *, int),
+			nhash(const char *),
+			samedomain(const char *, const char *);
+extern char		*protocolname(int),
+			*servicename(u_int16_t, char *),
+			*savestr(const char *);
 #ifndef BSD
-extern int		getdtablesize __P((void));
+extern int		getdtablesize(void);
 #endif
 extern struct databuf	*rm_datum __P((struct databuf *,
 				       struct namebuf *,
@@ -81,26 +81,26 @@ extern struct namebuf	*rm_name __P((struct namebuf *,
 				      struct namebuf **,
 				      struct namebuf *));
 #ifdef INVQ
-extern void		addinv __P((struct namebuf *, struct databuf *)),
-			rminv __P((struct databuf *));
-struct invbuf		*saveinv __P((void));
+extern void		addinv(struct namebuf *, struct databuf *),
+			rminv(struct databuf *);
+struct invbuf		*saveinv(void);
 #endif
-extern char *		ctimel __P((long));
-extern struct in_addr	data_inaddr __P((const u_char *data));
+extern char *		ctimel(long);
+extern struct in_addr	data_inaddr(const u_char *data);
 extern void		setsignal __P((int, int, SIG_FN (*)())),
 			resignal __P((int, int, SIG_FN (*)()));
-extern void		db_free __P((struct databuf *));
+extern void		db_free(struct databuf *);
 /* --from db_glue.c-- */
 
 /* ++from db_lookup.c++ */
 extern struct namebuf	*nlookup __P((const char *, struct hashbuf **,
 				      const char **, int));
-extern struct namebuf	*np_parent __P((struct namebuf *));
-extern int		match __P((struct databuf *, int, int));
+extern struct namebuf	*np_parent(struct namebuf *);
+extern int		match(struct databuf *, int, int);
 /* --from db_lookup.c-- */
 
 /* ++from db_secure.c++ */
 #ifdef SECURE_ZONES
-extern int		build_secure_netlist __P((struct zoneinfo *));
+extern int		build_secure_netlist(struct zoneinfo *);
 #endif
 /* --from db_secure.c-- */
diff --git a/usr.sbin/named/named/db_glue.c b/usr.sbin/named/named/db_glue.c
index d623152676a..0653f6c9bad 100644
--- a/usr.sbin/named/named/db_glue.c
+++ b/usr.sbin/named/named/db_glue.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: db_glue.c,v 1.2 1997/03/12 10:42:23 downsj Exp $	*/
+/*	$OpenBSD: db_glue.c,v 1.3 2002/02/16 21:28:06 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)db_glue.c	4.4 (Berkeley) 6/1/90";
 static char rcsid[] = "$From: db_glue.c,v 8.16 1996/09/22 00:13:10 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: db_glue.c,v 1.2 1997/03/12 10:42:23 downsj Exp $";
+static char rcsid[] = "$OpenBSD: db_glue.c,v 1.3 2002/02/16 21:28:06 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -95,7 +95,7 @@ static struct valuelist *servicelist, *protolist;
  * forcing both to drag in our own res_send rather than ultrix's hesiod
  * version of that.
  */
-static const int (*unused_junk)__P((const u_char *, int, u_char *, int)) =
+static const int (*unused_junk)(const u_char *, int, u_char *, int) =
 	res_send;
 ;
 #endif
diff --git a/usr.sbin/named/named/db_load.c b/usr.sbin/named/named/db_load.c
index 2c872941679..bfafd9d96c9 100644
--- a/usr.sbin/named/named/db_load.c
+++ b/usr.sbin/named/named/db_load.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: db_load.c,v 1.5 1998/05/22 07:09:13 millert Exp $	*/
+/*	$OpenBSD: db_load.c,v 1.6 2002/02/16 21:28:06 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)db_load.c	4.38 (Berkeley) 3/2/91";
 static char rcsid[] = "$From: db_load.c,v 8.33 1998/05/11 04:19:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: db_load.c,v 1.5 1998/05/22 07:09:13 millert Exp $";
+static char rcsid[] = "$OpenBSD: db_load.c,v 1.6 2002/02/16 21:28:06 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -111,22 +111,22 @@ static char rcsid[] = "$OpenBSD: db_load.c,v 1.5 1998/05/22 07:09:13 millert Exp
 
 #define ALLOW_LONG_TXT_RDATA
 
-static int		gettoken __P((register FILE *, const char *)),
-			getnonblank __P((FILE *, const char *)),
-			getprotocol __P((FILE *, const char *)),
-			getservices __P((int, char *, FILE *, const char *)),
-			getcharstring __P((char *, char *, int, int, int, FILE *, const char *));
-static void		makename __P((char *, const char *));
+static int		gettoken(register FILE *, const char *),
+			getnonblank(FILE *, const char *),
+			getprotocol(FILE *, const char *),
+			getservices(int, char *, FILE *, const char *),
+			getcharstring(char *, char *, int, int, int, FILE *, const char *);
+static void		makename(char *, const char *);
 static int		makename_ok __P((char *name, const char *origin,
 					 int class,
 					 enum transport transport,
 					 enum context context,
 					 const char *owner,
 					 const char *filename, int lineno));
-static int		getmlword __P((char *, int, FILE *, int));
-static int		getallwords __P((char *, int, FILE *, int));
-static u_int32_t	wordtouint32 __P((char *));
-static u_int32_t	datetosecs __P((char *, int *));
+static int		getmlword(char *, int, FILE *, int);
+static int		getallwords(char *, int, FILE *, int);
+static u_int32_t	wordtouint32(char *);
+static u_int32_t	datetosecs(char *, int *);
 
 static int		wordtouint32_error = 0;
 static int		empty_token = 0;
diff --git a/usr.sbin/named/named/ns_forw.c b/usr.sbin/named/named/ns_forw.c
index 4c48cc33058..c75ef1c19bf 100644
--- a/usr.sbin/named/named/ns_forw.c
+++ b/usr.sbin/named/named/ns_forw.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ns_forw.c,v 1.5 2001/01/28 02:12:50 niklas Exp $	*/
+/*	$OpenBSD: ns_forw.c,v 1.6 2002/02/16 21:28:06 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)ns_forw.c	4.32 (Berkeley) 3/3/91";
 static char rcsid[] = "$From: ns_forw.c,v 8.19 1996/12/02 09:27:36 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ns_forw.c,v 1.5 2001/01/28 02:12:50 niklas Exp $";
+static char rcsid[] = "$OpenBSD: ns_forw.c,v 1.6 2002/02/16 21:28:06 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -672,7 +672,7 @@ nslookup(nsp, qp, syslogdname, sysloginfo)
 	}
 	if (n > 1) {
 		qsort((char *)qp->q_addr, n, sizeof(struct qserv),
-		      (int (*)__P((const void *, const void *)))qcomp);
+		      (int (*)(const void *, const void *))qcomp);
 	}
 	return (n - naddr);
 }
diff --git a/usr.sbin/named/named/ns_func.h b/usr.sbin/named/named/ns_func.h
index eddec048789..8a64bd15a74 100644
--- a/usr.sbin/named/named/ns_func.h
+++ b/usr.sbin/named/named/ns_func.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_func.h,v 1.2 1997/03/12 10:42:29 downsj Exp $	*/
+/*	$OpenBSD: ns_func.h,v 1.3 2002/02/16 21:28:06 millert Exp $	*/
 
 /* ns_func.h - declarations for ns_*.c's externally visible functions
  *
@@ -6,23 +6,23 @@
  */
 
 /* ++from ns_resp.c++ */
-extern void		ns_resp __P((u_char *, int)),
-			prime_cache __P((void)),
-			delete_all __P((struct namebuf *, int, int)),
-			delete_stale __P((struct namebuf *));
+extern void		ns_resp(u_char *, int),
+			prime_cache(void),
+			delete_all(struct namebuf *, int, int),
+			delete_stale(struct namebuf *);
 extern struct qinfo	*sysquery __P((const char *, int, int,
 				       struct in_addr *, int, int));
 extern struct notify	*findNotifyPeer __P((const struct zoneinfo *,
 					   struct in_addr));
-extern void		sysnotify __P((const char *, int, int));
+extern void		sysnotify(const char *, int, int);
 extern int		doupdate __P((u_char *, int, u_char *, int,
 				      struct databuf **, int, u_int)),
-			send_msg __P((u_char *, int, struct qinfo *)),
+			send_msg(u_char *, int, struct qinfo *),
 			findns __P((struct namebuf **, int,
 				    struct databuf **, int *, int)),
 			finddata __P((struct namebuf *, int, int, HEADER *,
 				      char **, int *, int *)),
-			wanted __P((struct databuf *, int, int)),
+			wanted(struct databuf *, int, int),
 			add_data __P((struct namebuf *,
 				      struct databuf **,
 				      u_char *, int, int *));
@@ -33,12 +33,12 @@ extern void		ns_req __P((u_char *, int, int,
 				    struct qstream *,
 				    struct sockaddr_in *,
 				    int)),
-			free_addinfo __P((void)),
-			free_nsp __P((struct databuf **));
-extern int		stale __P((struct databuf *)),
+			free_addinfo(void),
+			free_nsp(struct databuf **);
+extern int		stale(struct databuf *),
 			make_rr __P((const char *, struct databuf *,
 				     u_char *, int, int)),
-			doaddinfo __P((HEADER *, u_char *, int)),
+			doaddinfo(HEADER *, u_char *, int),
 			doaddauth __P((HEADER *, u_char *, int,
 				       struct namebuf *,
 				       struct databuf *));
@@ -49,7 +49,7 @@ extern int		findZonePri __P((const struct zoneinfo *,
 /* --from ns_req.c-- */
 
 /* ++from ns_forw.c++ */
-extern time_t		retrytime __P((struct qinfo *));
+extern time_t		retrytime(struct qinfo *);
 extern int		ns_forw __P((struct databuf *nsp[],
 				     u_char *msg,
 				     int msglen,
@@ -60,96 +60,96 @@ extern int		ns_forw __P((struct databuf *nsp[],
 				     char *dname,
 				     int class, int type,
 				     struct namebuf *np)),
-			haveComplained __P((const char *, const char *)),
+			haveComplained(const char *, const char *),
 			nslookup __P((struct databuf *nsp[],
 				      struct qinfo *qp,
 				      const char *syslogdname,
 				      const char *sysloginfo)),
-			qcomp __P((struct qserv *, struct qserv *));
-extern struct qdatagram	*aIsUs __P((struct in_addr));
-extern void		schedretry __P((struct qinfo *, time_t)),
-			unsched __P((struct qinfo *)),
-			retry __P((struct qinfo *)),
-			qflush __P((void)),
-			qremove __P((struct qinfo *)),
-			nsfree __P((struct qinfo *, char *)),
-			qfree __P((struct qinfo *));
-extern struct qinfo	*qfindid __P((u_int16_t)),
-			*qnew __P((const char *, int, int));
+			qcomp(struct qserv *, struct qserv *);
+extern struct qdatagram	*aIsUs(struct in_addr);
+extern void		schedretry(struct qinfo *, time_t),
+			unsched(struct qinfo *),
+			retry(struct qinfo *),
+			qflush(void),
+			qremove(struct qinfo *),
+			nsfree(struct qinfo *, char *),
+			qfree(struct qinfo *);
+extern struct qinfo	*qfindid(u_int16_t),
+			*qnew(const char *, int, int);
 /* --from ns_forw.c-- */
 
 /* ++from ns_main.c++ */
-extern u_int32_t	net_mask __P((struct in_addr));
-extern void		sqrm __P((struct qstream *)),
-			sqflush __P((struct qstream *allbut)),
-			dqflush __P((time_t gen)),
-			sq_done __P((struct qstream *)),
-			ns_setproctitle __P((char *, int)),
-			getnetconf __P((void)),
-			nsid_init __P((void));
-extern u_int16_t	nsid_next __P((void));
-extern struct netinfo	*findnetinfo __P((struct in_addr));
+extern u_int32_t	net_mask(struct in_addr);
+extern void		sqrm(struct qstream *),
+			sqflush(struct qstream *allbut),
+			dqflush(time_t gen),
+			sq_done(struct qstream *),
+			ns_setproctitle(char *, int),
+			getnetconf(void),
+			nsid_init(void);
+extern u_int16_t	nsid_next(void);
+extern struct netinfo	*findnetinfo(struct in_addr);
 /* --from ns_main.c-- */
 
 /* ++from ns_maint.c++ */
-extern void		ns_maint __P((void)),
-			sched_maint __P((void)),
+extern void		ns_maint(void),
+			sched_maint(void),
 #ifdef CLEANCACHE
-			remove_zone __P((struct hashbuf *, int, int)),
+			remove_zone(struct hashbuf *, int, int),
 #else
-			remove_zone __P((struct hashbuf *, int)),
+			remove_zone(struct hashbuf *, int),
 #endif
 #ifdef PURGE_ZONE
-			purge_zone __P((const char *, struct hashbuf *, int)),
+			purge_zone(const char *, struct hashbuf *, int),
 #endif
-			loadxfer __P((void)),
-			qserial_query __P((struct zoneinfo *)),
-			qserial_answer __P((struct qinfo *, u_int32_t));
-extern void		holdsigchld __P((void));
-extern void		releasesigchld __P((void));
-extern SIG_FN		reapchild __P(());
-extern void		endxfer __P((void));
-extern const char *	zoneTypeString __P((const struct zoneinfo *));
+			loadxfer(void),
+			qserial_query(struct zoneinfo *),
+			qserial_answer(struct qinfo *, u_int32_t);
+extern void		holdsigchld(void);
+extern void		releasesigchld(void);
+extern SIG_FN		reapchild();
+extern void		endxfer(void);
+extern const char *	zoneTypeString(const struct zoneinfo *);
 #ifdef DEBUG
-extern void		printzoneinfo __P((int));
+extern void		printzoneinfo(int);
 #endif
 /* --from ns_maint.c-- */
 
 /* ++from ns_sort.c++ */
-extern struct netinfo	*local __P((struct sockaddr_in *));
+extern struct netinfo	*local(struct sockaddr_in *);
 extern void		sort_response __P((u_char *, int,
 					   struct netinfo *,
 					   u_char *));
 /* --from ns_sort.c-- */
 
 /* ++from ns_init.c++ */
-extern void		ns_refreshtime __P((struct zoneinfo *, time_t)),
-			ns_retrytime __P((struct zoneinfo *, time_t)),
-			ns_init __P((char *));
-extern enum context	ns_ptrcontext __P((const char *owner));
-extern enum context	ns_ownercontext __P((int type, enum transport));
+extern void		ns_refreshtime(struct zoneinfo *, time_t),
+			ns_retrytime(struct zoneinfo *, time_t),
+			ns_init(char *);
+extern enum context	ns_ptrcontext(const char *owner);
+extern enum context	ns_ownercontext(int type, enum transport);
 extern int		ns_nameok __P((const char *name, int class,
 				       enum transport, enum context,
 				       const char *owner,
 				       struct in_addr source));
-extern int		ns_wildcard __P((const char *name));
+extern int		ns_wildcard(const char *name);
 /* --from ns_init.c-- */
 
 /* ++from ns_ncache.c++ */
-extern void		cache_n_resp __P((u_char *, int));
+extern void		cache_n_resp(u_char *, int);
 /* --from ns_ncache.c-- */
 
 /* ++from ns_udp.c++ */
-extern void		ns_udp __P((void));
+extern void		ns_udp(void);
 /* --from ns_udp.c-- */
 
 /* ++from ns_stats.c++ */
-extern void		ns_stats __P((void));
+extern void		ns_stats(void);
 #ifdef XSTATS
-extern void		ns_logstats __P((void));
+extern void		ns_logstats(void);
 #endif
-extern void		qtypeIncr __P((int qtype));
-extern struct nameser	*nameserFind __P((struct in_addr addr, int flags));
+extern void		qtypeIncr(int qtype);
+extern struct nameser	*nameserFind(struct in_addr addr, int flags);
 #define NS_F_INSERT	0x0001
 extern void		nameserIncr __P((struct in_addr addr,
 					 enum nameserStats which));
@@ -166,7 +166,7 @@ extern int
 #endif
 			dovalidate __P((u_char *, int, u_char *, int, int,
 					char *, struct sockaddr_in *, int *)),
-			update_msg __P((u_char *, int *, int Vlist[], int));
+			update_msg(u_char *, int *, int Vlist[], int);
 extern void		store_name_addr __P((const char *, struct in_addr,
 					     const char *, const char *));
 /* --from ns_validate.c-- */
diff --git a/usr.sbin/named/named/ns_init.c b/usr.sbin/named/named/ns_init.c
index 6ff86230845..0d6d6ffe46e 100644
--- a/usr.sbin/named/named/ns_init.c
+++ b/usr.sbin/named/named/ns_init.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ns_init.c,v 1.6 1998/05/22 07:09:15 millert Exp $	*/
+/*	$OpenBSD: ns_init.c,v 1.7 2002/02/16 21:28:06 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)ns_init.c	4.38 (Berkeley) 3/21/91";
 static char rcsid[] = "$From: ns_init.c,v 8.26 1998/05/11 04:19:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ns_init.c,v 1.6 1998/05/22 07:09:15 millert Exp $";
+static char rcsid[] = "$OpenBSD: ns_init.c,v 1.7 2002/02/16 21:28:06 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -83,22 +83,22 @@ static char rcsid[] = "$OpenBSD: ns_init.c,v 1.6 1998/05/22 07:09:15 millert Exp
 
 enum limit { Datasize , Files };
 
-static void		zoneinit __P((struct zoneinfo *)),
-			get_forwarders __P((FILE *)),
-			boot_read __P((const char *filename, int includefile)),
+static void		zoneinit(struct zoneinfo *),
+			get_forwarders(FILE *),
+			boot_read(const char *filename, int includefile),
 #ifdef DEBUG
-			content_zone __P((int)),
+			content_zone(int),
 #endif
-			do_reload __P((char *, int, int)),
-			free_forwarders __P((void)),
-			ns_limit __P((const char *name, int value)),
+			do_reload(char *, int, int),
+			free_forwarders(void),
+			ns_limit(const char *name, int value),
 			ns_checknames __P((const char *names,
 					   const char *severity)),
 			ns_rlimit __P((const char *name, enum limit limit,
 				       long value)),
-			ns_option __P((const char *name));
+			ns_option(const char *name);
 
-static struct zoneinfo	*find_zone __P((char *, int, int));
+static struct zoneinfo	*find_zone(char *, int, int);
 
 static enum severity	checkname_severity[num_trans];
 
diff --git a/usr.sbin/named/named/ns_main.c b/usr.sbin/named/named/ns_main.c
index 9015b3690d6..8ec43398cef 100644
--- a/usr.sbin/named/named/ns_main.c
+++ b/usr.sbin/named/named/ns_main.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ns_main.c,v 1.17 2001/11/29 01:10:31 millert Exp $	*/
+/*	$OpenBSD: ns_main.c,v 1.18 2002/02/16 21:28:06 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)ns_main.c	4.55 (Berkeley) 7/1/91";
 static char rcsid[] = "$From: ns_main.c,v 8.26 1998/05/11 04:19:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ns_main.c,v 1.17 2001/11/29 01:10:31 millert Exp $";
+static char rcsid[] = "$OpenBSD: ns_main.c,v 1.18 2002/02/16 21:28:06 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -139,30 +139,30 @@ static	size_t			mask_size;
 static	char			**Argv = NULL;
 static	char			*LastArg = NULL;	/* end of argv */
 
-static	struct qstream		*sqadd __P((void));
+static	struct qstream		*sqadd(void);
 static	int			only_digits(const char *);
-static	void			sq_query __P((struct qstream *)),
-				opensocket __P((struct qdatagram *)),
+static	void			sq_query(struct qstream *),
+				opensocket(struct qdatagram *),
 #ifdef DEBUG
-				printnetinfo __P((struct netinfo *)),
+				printnetinfo(struct netinfo *),
 #endif
-				setdebug __P((int));
-static	int			sq_here __P((struct qstream *));
+				setdebug(int);
+static	int			sq_here(struct qstream *);
 
-static	SIG_FN			onintr __P(()),
-				maint_alarm __P(()),
-				setdumpflg __P(()),
-				onhup __P(()),
+static	SIG_FN			onintr(),
+				maint_alarm(),
+				setdumpflg(),
+				onhup(),
 #if defined(QRYLOG) && defined(SIGWINCH)
-				setQrylogFlg __P(()),
+				setQrylogFlg(),
 #endif
-				setIncrDbgFlg __P(()),
-				setNoDbgFlg __P(()),
+				setIncrDbgFlg(),
+				setNoDbgFlg(),
 #ifdef SIGSYS
-				sigprof __P(()),
+				sigprof(),
 #endif /* SIGSYS */
-				setchkptflg __P(()),
-				setstatsflg __P(());
+				setchkptflg(),
+				setstatsflg();
 
 static void
 usage()
diff --git a/usr.sbin/named/named/ns_maint.c b/usr.sbin/named/named/ns_maint.c
index c555795b82f..905dca1ed29 100644
--- a/usr.sbin/named/named/ns_maint.c
+++ b/usr.sbin/named/named/ns_maint.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ns_maint.c,v 1.3 1998/05/23 19:24:52 millert Exp $	*/
+/*	$OpenBSD: ns_maint.c,v 1.4 2002/02/16 21:28:06 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)ns_maint.c	4.39 (Berkeley) 3/2/91";
 static char rcsid[] = "$From: ns_maint.c,v 8.18 1996/09/22 00:13:10 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ns_maint.c,v 1.3 1998/05/23 19:24:52 millert Exp $";
+static char rcsid[] = "$OpenBSD: ns_maint.c,v 1.4 2002/02/16 21:28:06 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -87,12 +87,12 @@ static int		xfers_running,	/* # of xfers running */
 			xfers_deferred,	/* # of needed xfers not run yet */
 			qserials_running,
 			alarm_pending,	/* flag */
-			nxfers __P((struct zoneinfo *, int));
+			nxfers(struct zoneinfo *, int);
 
-static void		startxfer __P((struct zoneinfo *)),
-			abortxfer __P((struct zoneinfo *)),
-			addxfer __P((struct zoneinfo *)),
-			tryxfer __P((void));
+static void		startxfer(struct zoneinfo *),
+			abortxfer(struct zoneinfo *),
+			addxfer(struct zoneinfo *),
+			tryxfer(void);
 
 #define	qserial_qfull()	(qserials_running == MAXQSERIAL)
 
@@ -632,8 +632,8 @@ remove_zone(htp, zone)
 }
 
 #ifdef PURGE_ZONE
-static void purge_z_2 __P((struct hashbuf *, int));
-static bottom_of_zone __P((struct databuf *, int));
+static void purge_z_2(struct hashbuf *, int);
+static bottom_of_zone(struct databuf *, int);
 
 void
 purge_zone(dname, htp, class)
diff --git a/usr.sbin/named/named/ns_req.c b/usr.sbin/named/named/ns_req.c
index 16fe0fa9c24..8b1012e8fe5 100644
--- a/usr.sbin/named/named/ns_req.c
+++ b/usr.sbin/named/named/ns_req.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ns_req.c,v 1.7 2001/01/28 02:12:50 niklas Exp $	*/
+/*	$OpenBSD: ns_req.c,v 1.8 2002/02/16 21:28:06 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)ns_req.c	4.47 (Berkeley) 7/1/91";
 static char rcsid[] = "$From: ns_req.c,v 8.30 1998/05/11 04:19:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ns_req.c,v 1.7 2001/01/28 02:12:50 niklas Exp $";
+static char rcsid[] = "$OpenBSD: ns_req.c,v 1.8 2002/02/16 21:28:06 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -126,7 +126,7 @@ static enum req_action	req_notify __P((HEADER *hp, u_char **cpp, u_char *eom,
 					u_char *msg,struct sockaddr_in *from));
 #endif
 
-static void		fwritemsg __P((FILE *, u_char *, int)),
+static void		fwritemsg(FILE *, u_char *, int),
 			doaxfr __P((struct namebuf *, FILE *,
 				    struct namebuf *, int)),
 			startxfr __P((struct qstream *, struct namebuf *,
@@ -135,7 +135,7 @@ static void		fwritemsg __P((FILE *, u_char *, int)),
 static struct addinfo	addinfo[NADDRECS];
 static void		addname __P((const char *, const char *,
 				     u_int16_t, u_int16_t));
-static void		copyCharString __P((u_char **, const char *));
+static void		copyCharString(u_char **, const char *);
 
 /*
  * Process request using database; assemble and send response.
diff --git a/usr.sbin/named/named/ns_resp.c b/usr.sbin/named/named/ns_resp.c
index e13396b5a34..c5d4ef9870a 100644
--- a/usr.sbin/named/named/ns_resp.c
+++ b/usr.sbin/named/named/ns_resp.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ns_resp.c,v 1.5 1998/05/22 07:09:19 millert Exp $	*/
+/*	$OpenBSD: ns_resp.c,v 1.6 2002/02/16 21:28:06 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)ns_resp.c	4.65 (Berkeley) 3/3/91";
 static char rcsid[] = "$From: ns_resp.c,v 8.41 1998/04/07 04:59:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ns_resp.c,v 1.5 1998/05/22 07:09:19 millert Exp $";
+static char rcsid[] = "$OpenBSD: ns_resp.c,v 1.6 2002/02/16 21:28:06 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -137,20 +137,20 @@ struct flush_set {
 
 static void		rrsetadd __P((struct flush_set *, char *,
 				      struct databuf *)),
-			rrsetupdate __P((struct flush_set *, int flags)),
-			flushrrset __P((struct flush_set *)),
-			free_flushset __P((struct flush_set *));
-static int		rrsetcmp __P((char *, struct db_list *)),
-			check_root __P((void)),
-			check_ns __P((void)),
+			rrsetupdate(struct flush_set *, int flags),
+			flushrrset(struct flush_set *),
+			free_flushset(struct flush_set *);
+static int		rrsetcmp(char *, struct db_list *),
+			check_root(void),
+			check_ns(void),
 			rrextract __P((u_char *, int, u_char *,
 				       struct databuf **, char *, int,
 				       char **));
 
-static void		add_related_additional __P((char *));
-static void		free_related_additional __P((void));
-static int		related_additional __P((char *));
-static void		maybe_free __P((char **));
+static void		add_related_additional(char *);
+static void		free_related_additional(void);
+static int		related_additional(char *);
+static void		maybe_free(char **);
 
 #define MAX_RELATED 100
 
diff --git a/usr.sbin/named/named/ns_sort.c b/usr.sbin/named/named/ns_sort.c
index 26e8a5dee5d..7380c98170a 100644
--- a/usr.sbin/named/named/ns_sort.c
+++ b/usr.sbin/named/named/ns_sort.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ns_sort.c,v 1.2 1997/03/12 10:42:35 downsj Exp $	*/
+/*	$OpenBSD: ns_sort.c,v 1.3 2002/02/16 21:28:06 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)ns_sort.c	4.10 (Berkeley) 3/3/91";
 static char rcsid[] = "$From: ns_sort.c,v 8.3 1995/12/22 10:20:30 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ns_sort.c,v 1.2 1997/03/12 10:42:35 downsj Exp $";
+static char rcsid[] = "$OpenBSD: ns_sort.c,v 1.3 2002/02/16 21:28:06 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -77,7 +77,7 @@ static char rcsid[] = "$OpenBSD: ns_sort.c,v 1.2 1997/03/12 10:42:35 downsj Exp
 
 #include "named.h"
 
-static int sort_rr __P((u_char *cp, int count, struct netinfo *ntp, u_char *eom));
+static int sort_rr(u_char *cp, int count, struct netinfo *ntp, u_char *eom);
 
 #ifdef SORT_RESPONSE
 struct netinfo *
diff --git a/usr.sbin/named/named/ns_stats.c b/usr.sbin/named/named/ns_stats.c
index e3746b97dd2..f822c60b5f8 100644
--- a/usr.sbin/named/named/ns_stats.c
+++ b/usr.sbin/named/named/ns_stats.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ns_stats.c,v 1.4 2000/06/29 07:20:52 deraadt Exp $	*/
+/*	$OpenBSD: ns_stats.c,v 1.5 2002/02/16 21:28:06 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)ns_stats.c	4.10 (Berkeley) 6/27/90";
 static char rcsid[] = "$From: ns_stats.c,v 8.8 1996/09/22 00:13:10 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ns_stats.c,v 1.4 2000/06/29 07:20:52 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ns_stats.c,v 1.5 2002/02/16 21:28:06 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -114,7 +114,7 @@ static const char *typenames[T_ANY+1] = {
 	0, 0, "AXFR", "MAILB", "MAILA", "ANY" 
 };
 
-static void		nameserStats __P((FILE *));
+static void		nameserStats(FILE *);
 
 void
 ns_stats()
diff --git a/usr.sbin/named/named/ns_validate.c b/usr.sbin/named/named/ns_validate.c
index e412f25a5d3..2eba777c7a6 100644
--- a/usr.sbin/named/named/ns_validate.c
+++ b/usr.sbin/named/named/ns_validate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_validate.c,v 1.3 1998/05/22 00:47:46 millert Exp $	*/
+/*	$OpenBSD: ns_validate.c,v 1.4 2002/02/16 21:28:06 millert Exp $	*/
 
 /**************************************************************************
  * ns_validate.c (was security.c in original ISI contribution)
@@ -27,7 +27,7 @@
 
 #ifdef VALIDATE
 
-static int		isvalid __P((struct namebuf *, int, int, char *, int)),
+static int		isvalid(struct namebuf *, int, int, char *, int),
 			check_addr_ns __P((struct databuf **,
 					   struct sockaddr_in *,
 					   char *)),
@@ -35,7 +35,7 @@ static int		isvalid __P((struct namebuf *, int, int, char *, int)),
 					     struct sockaddr_in *,
 					     char *));
 #if 0
-static void		stick_in_queue __P((char *, int, int, char *));
+static void		stick_in_queue(char *, int, int, char *);
 #endif
 
 static NAMEADDR		nameaddrlist[MAXNAMECACHE];
diff --git a/usr.sbin/named/named/storage.c b/usr.sbin/named/named/storage.c
index e63a9645897..0bd21de63b9 100644
--- a/usr.sbin/named/named/storage.c
+++ b/usr.sbin/named/named/storage.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: storage.c,v 1.3 1998/05/22 00:47:47 millert Exp $	*/
+/*	$OpenBSD: storage.c,v 1.4 2002/02/16 21:28:06 millert Exp $	*/
 
 /*
  * ++Copyright++ 1985, 1989
@@ -61,7 +61,7 @@
 
 #include "../conf/portability.h"
 #include "../conf/options.h"
-extern void panic __P((int, const char *));
+extern void panic(int, const char *);
 
 #ifdef DSTORAGE
 /*
diff --git a/usr.sbin/named/named/tree.h b/usr.sbin/named/named/tree.h
index 75e89500cef..7d2af9e03ec 100644
--- a/usr.sbin/named/named/tree.h
+++ b/usr.sbin/named/named/tree.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tree.h,v 1.3 1998/05/22 00:47:49 millert Exp $	*/
+/*	$OpenBSD: tree.h,v 1.4 2002/02/16 21:28:06 millert Exp $	*/
 
 /* tree.h - declare structures used by tree library
  *
@@ -39,7 +39,7 @@ typedef	struct tree_s {
 	tree;
 
 
-void	tree_init	__P((tree **));
+void	tree_init(tree **);
 tree_t	tree_srch	__P((tree **, int (*)(), tree_t));
 tree_t	tree_add	__P((tree **, int (*)(), tree_t, void (*)()));
 int	tree_delete	__P((tree **, int (*)(), tree_t, void (*)()));
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index 4491b05ee88..fb7ff983b28 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ndp.c,v 1.12 2001/11/08 09:52:02 itojun Exp $	*/
+/*	$OpenBSD: ndp.c,v 1.13 2002/02/16 21:28:06 millert Exp $	*/
 /*	$KAME: ndp.c,v 1.69 2001/07/23 14:46:31 itojun Exp $	*/
 
 /*
@@ -139,33 +139,33 @@ char ntop_buf[INET6_ADDRSTRLEN];	/* inet_ntop() */
 char host_buf[NI_MAXHOST];		/* getnameinfo() */
 char ifix_buf[IFNAMSIZ];		/* if_indextoname() */
 
-int main __P((int, char **));
-int file __P((char *));
-void getsocket __P((void));
-int set __P((int, char **));
-void get __P((char *));
-int delete __P((char *));
-void dump __P((struct in6_addr *));
+int main(int, char **);
+int file(char *);
+void getsocket(void);
+int set(int, char **);
+void get(char *);
+int delete(char *);
+void dump(struct in6_addr *);
 static struct in6_nbrinfo *getnbrinfo __P((struct in6_addr *addr,
 					   int ifindex, int));
-static char *ether_str __P((struct sockaddr_dl *));
-int ndp_ether_aton __P((char *, u_char *));
-void usage __P((void));
-int rtmsg __P((int));
-void ifinfo __P((int, char **));
-void rtrlist __P((void));
-void plist __P((void));
-void pfx_flush __P((void));
-void rtrlist __P((void));
-void rtr_flush __P((void));
-void harmonize_rtr __P((void));
+static char *ether_str(struct sockaddr_dl *);
+int ndp_ether_aton(char *, u_char *);
+void usage(void);
+int rtmsg(int);
+void ifinfo(int, char **);
+void rtrlist(void);
+void plist(void);
+void pfx_flush(void);
+void rtrlist(void);
+void rtr_flush(void);
+void harmonize_rtr(void);
 #ifdef SIOCSDEFIFACE_IN6	/* XXX: check SIOCGDEFIFACE_IN6 as well? */
-static void getdefif __P((void));
-static void setdefif __P((char *));
+static void getdefif(void);
+static void setdefif(char *);
 #endif
-static char *sec2str __P((time_t t));
-static char *ether_str __P((struct sockaddr_dl *sdl));
-static void ts_print __P((const struct timeval *));
+static char *sec2str(time_t t);
+static char *ether_str(struct sockaddr_dl *sdl);
+static void ts_print(const struct timeval *);
 
 #ifdef ICMPV6CTL_ND6_DRLIST
 static char *rtpref_str[] = {
diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
index f0b56ef022b..dedd22da1fc 100644
--- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
+++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netgroup_mkdb.c,v 1.8 2000/06/30 16:00:26 millert Exp $	*/
+/*	$OpenBSD: netgroup_mkdb.c,v 1.9 2002/02/16 21:28:06 millert Exp $	*/
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 #ifndef lint
-static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.8 2000/06/30 16:00:26 millert Exp $";
+static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.9 2002/02/16 21:28:06 millert Exp $";
 #endif
 
 #include <sys/types.h>
@@ -70,23 +70,23 @@ struct nentry {
 };
 
 
-static DB       *ng_insert __P((DB *, const char *));
+static DB       *ng_insert(DB *, const char *);
 static void	 ng_reventry __P((DB *, DB *, struct nentry *, char *,
 				  size_t, struct stringlist *));
 
-static void	 ng_print __P((struct nentry *, struct string *));
-static void	 ng_rprint __P((DB *, struct string *));
-static DB	*ng_reverse __P((DB *, size_t));
-static DB	*ng_load __P((const char *));
-static void	 ng_write __P((DB *, DB *, int));
-static void	 ng_rwrite __P((DB *, DB *, int));
-static void	 usage __P((void));
-static void	 cleanup __P((void));
+static void	 ng_print(struct nentry *, struct string *);
+static void	 ng_rprint(DB *, struct string *);
+static DB	*ng_reverse(DB *, size_t);
+static DB	*ng_load(const char *);
+static void	 ng_write(DB *, DB *, int);
+static void	 ng_rwrite(DB *, DB *, int);
+static void	 usage(void);
+static void	 cleanup(void);
 
 #ifdef DEBUG_NG
 static int 	 debug = 0;
-static void	 ng_dump __P((DB *));
-static void	 ng_rdump __P((DB *));
+static void	 ng_dump(DB *);
+static void	 ng_rdump(DB *);
 #endif /* DEBUG_NG */
 
 
diff --git a/usr.sbin/netgroup_mkdb/str.h b/usr.sbin/netgroup_mkdb/str.h
index da5fd9a6713..6906ac5ed51 100644
--- a/usr.sbin/netgroup_mkdb/str.h
+++ b/usr.sbin/netgroup_mkdb/str.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: str.h,v 1.1 1995/10/18 08:47:57 deraadt Exp $
+ * $Id: str.h,v 1.2 2002/02/16 21:28:06 millert Exp $
  */
 
 #include <sys/types.h>
@@ -40,8 +40,8 @@ struct string {
 };
 
 __BEGIN_DECLS
-void str_init		__P((struct string *));
-void str_append		__P((struct string *, const char *, int));
-void str_prepend	__P((struct string *, const char *, int));
-void str_free		__P((struct string *));
+void str_init(struct string *);
+void str_append(struct string *, const char *, int);
+void str_prepend(struct string *, const char *, int);
+void str_free(struct string *);
 __END_DECLS
diff --git a/usr.sbin/netgroup_mkdb/util.h b/usr.sbin/netgroup_mkdb/util.h
index a9773fa2cb5..84523a4f422 100644
--- a/usr.sbin/netgroup_mkdb/util.h
+++ b/usr.sbin/netgroup_mkdb/util.h
@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-void *emalloc	__P((size_t));
-void *erealloc	__P((void *, size_t));
-char *getline	__P((FILE *, size_t *));
+void *emalloc(size_t);
+void *erealloc(void *, size_t);
+char *getline(FILE *, size_t *);
 __END_DECLS
diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c
index fc6eb94d2ff..b7ca89ff9e3 100644
--- a/usr.sbin/pkg_install/add/main.c
+++ b/usr.sbin/pkg_install/add/main.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: main.c,v 1.13 2001/04/08 16:45:46 espie Exp $	*/
+/*	$OpenBSD: main.c,v 1.14 2002/02/16 21:28:06 millert Exp $	*/
 
 #ifndef lint
-static char *rcsid = "$OpenBSD: main.c,v 1.13 2001/04/08 16:45:46 espie Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.14 2002/02/16 21:28:06 millert Exp $";
 #endif
 
 /*
@@ -47,7 +47,7 @@ add_mode_t AddMode	= NORMAL;
 char **pkgs;
 int pkg_count = 0;
 
-static void usage __P((void));
+static void usage(void);
 
 int
 main(int argc, char **argv)
diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c
index 621bf09b71c..d3ff7c44439 100644
--- a/usr.sbin/pkg_install/create/main.c
+++ b/usr.sbin/pkg_install/create/main.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: main.c,v 1.9 2001/04/08 16:45:46 espie Exp $	*/
+/*	$OpenBSD: main.c,v 1.10 2002/02/16 21:28:06 millert Exp $	*/
 
 #ifndef lint
-static const char *rcsid = "$OpenBSD: main.c,v 1.9 2001/04/08 16:45:46 espie Exp $";
+static const char *rcsid = "$OpenBSD: main.c,v 1.10 2002/02/16 21:28:06 millert Exp $";
 #endif
 
 /*
@@ -39,7 +39,7 @@ size_t	PlayPenSize	= sizeof(PlayPen);
 int	Dereference	= 0;
 int	PlistOnly	= 0;
 
-static void usage __P((void));
+static void usage(void);
 
 int
 main(int argc, char **argv)
diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c
index 911f8ab936d..33384acbd97 100644
--- a/usr.sbin/pkg_install/delete/main.c
+++ b/usr.sbin/pkg_install/delete/main.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: main.c,v 1.8 2001/04/08 16:45:47 espie Exp $	*/
+/*	$OpenBSD: main.c,v 1.9 2002/02/16 21:28:07 millert Exp $	*/
 
 #include <sys/cdefs.h>
 #ifndef lint
-static char *rcsid = "$OpenBSD: main.c,v 1.8 2001/04/08 16:45:47 espie Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.9 2002/02/16 21:28:07 millert Exp $";
 #endif
 
 /*
@@ -36,7 +36,7 @@ char	*Prefix		= NULL;
 Boolean	NoDeInstall	= FALSE;
 Boolean	CleanDirs	= FALSE;
 
-static void usage __P((void));
+static void usage(void);
 
 int
 main(int argc, char **argv)
diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c
index ff89924ed21..d56147701fd 100644
--- a/usr.sbin/pkg_install/info/main.c
+++ b/usr.sbin/pkg_install/info/main.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: main.c,v 1.13 2001/04/08 16:45:47 espie Exp $	*/
+/*	$OpenBSD: main.c,v 1.14 2002/02/16 21:28:07 millert Exp $	*/
 
 #ifndef lint
-static char *rcsid = "$OpenBSD: main.c,v 1.13 2001/04/08 16:45:47 espie Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.14 2002/02/16 21:28:07 millert Exp $";
 #endif
 
 /*
@@ -39,7 +39,7 @@ char PlayPen[FILENAME_MAX];
 size_t PlayPenSize	= sizeof(PlayPen);
 char *CheckPkg		= NULL;
 
-static void usage __P((void));
+static void usage(void);
 
 int
 main(int argc, char **argv)
diff --git a/usr.sbin/pkg_install/sign/extern.h b/usr.sbin/pkg_install/sign/extern.h
index b8aa2365164..181a8c5c765 100644
--- a/usr.sbin/pkg_install/sign/extern.h
+++ b/usr.sbin/pkg_install/sign/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.3 1999/10/07 16:30:32 espie Exp $ */
+/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:28:07 millert Exp $ */
 /*-
  * Copyright (c) 1999 Marc Espie.
  *
@@ -41,7 +41,7 @@ struct signature;
 extern int read_header_and_diagnose __P((FILE *file, \
 	/*@out@*/struct mygzip_header *h, /*@null@*/struct signature **sign, \
 	const char *filename));
-extern int reap __P((pid_t pid));
+extern int reap(pid_t pid);
 
 /* sign.c */
 extern int sign __P((/*@observer@*/const char *filename, int type, \
@@ -72,7 +72,7 @@ extern void *new_sha1_checker __P((struct mygzip_header *h, \
 extern void sha1_add __P((void *arg, const char *buffer, \
 	size_t length));
 
-extern int sha1_sign_ok __P((void *arg));
+extern int sha1_sign_ok(void *arg);
 
 extern int retrieve_sha1_marker __P((const char *filename, \
 	struct signature **sign, const char *userid));
diff --git a/usr.sbin/pkg_install/sign/gzip.h b/usr.sbin/pkg_install/sign/gzip.h
index dc3267ea5c8..f55be34cf15 100644
--- a/usr.sbin/pkg_install/sign/gzip.h
+++ b/usr.sbin/pkg_install/sign/gzip.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: gzip.h,v 1.2 1999/10/04 21:46:28 espie Exp $ */
+/* $OpenBSD: gzip.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */
 /*-
  * Copyright (c) 1999 Marc Espie.
  *
@@ -77,8 +77,8 @@ extern int gzip_copy_header __P((const struct mygzip_header *h, \
 	/*@null@*/struct signature *sign, \
 	void (*add)(void *, const char *, size_t), void *data));
 
-extern void free_signature __P((/*@null@*/struct signature *sign));
-extern void sign_fill_tag __P((struct signature *sign));
+extern void free_signature(/*@null@*/struct signature *sign);
+extern void sign_fill_tag(struct signature *sign);
 #define KNOWN_TAGS 3
 #define TAG_PGP 0
 #define TAG_SHA1 1
diff --git a/usr.sbin/pkg_install/sign/pgp.h b/usr.sbin/pkg_install/sign/pgp.h
index 4487ce413aa..641ab4cbab4 100644
--- a/usr.sbin/pkg_install/sign/pgp.h
+++ b/usr.sbin/pkg_install/sign/pgp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pgp.h,v 1.2 1999/10/04 21:46:28 espie Exp $ */
+/* $OpenBSD: pgp.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */
 /* Estimate size of pgp signature */
 #define MAXPGPSIGNSIZE	1024
 
@@ -16,9 +16,9 @@ extern void *new_pgp_checker __P((struct mygzip_header *h, \
 extern void pgp_add __P((void *arg, const char *buffer, \
 	size_t length));
 
-extern int pgp_sign_ok __P((void *arg));
+extern int pgp_sign_ok(void *arg);
 
-extern void handle_pgp_passphrase __P((void));
+extern void handle_pgp_passphrase(void);
 
 extern int retrieve_pgp_signature __P((const char *filename, \
 struct signature **sign, const char *userid, char *envp[]));
diff --git a/usr.sbin/pkg_install/sign/stand.h b/usr.sbin/pkg_install/sign/stand.h
index c411ad3d2ef..9dda6faa520 100644
--- a/usr.sbin/pkg_install/sign/stand.h
+++ b/usr.sbin/pkg_install/sign/stand.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stand.h,v 1.2 1999/10/04 21:46:30 espie Exp $ */
+/* $OpenBSD: stand.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */
 
 /* provided to cater for BSD idiosyncrasies */
 
@@ -17,9 +17,9 @@
 #if defined(BSD4_4)
 #include <err.h>
 #else
-extern void set_program_name __P((const char * name));
-extern void warn __P((const char *fmt, ...));
-extern void warnx __P((const char *fmt, ...));
+extern void set_program_name(const char * name);
+extern void warn(const char *fmt, ...);
+extern void warnx(const char *fmt, ...);
 #endif
 
 #ifndef __GNUC__
diff --git a/usr.sbin/portmap/portmap.c b/usr.sbin/portmap/portmap.c
index def3ae3da88..e8a53478797 100644
--- a/usr.sbin/portmap/portmap.c
+++ b/usr.sbin/portmap/portmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: portmap.c,v 1.19 2001/07/27 20:34:36 pvalchev Exp $	*/
+/*	$OpenBSD: portmap.c,v 1.20 2002/02/16 21:28:07 millert Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 Theo de Raadt (OpenBSD). All rights reserved.
@@ -44,7 +44,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "from: @(#)portmap.c	5.4 (Berkeley) 4/19/91";
 #else
-static char rcsid[] = "$OpenBSD: portmap.c,v 1.19 2001/07/27 20:34:36 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: portmap.c,v 1.20 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -103,10 +103,10 @@ static char sccsid[] = "@(#)portmap.c 1.32 87/08/06 Copyr 1984 Sun Micro";
 #include <rpcsvc/nfs_prot.h>
 #include <arpa/inet.h>
 
-void reg_service __P((struct svc_req *, SVCXPRT *));
-void reap	__P((void));
-void callit __P((struct svc_req *, SVCXPRT *));
-int check_callit __P((struct sockaddr_in *, u_long, u_long, u_long));
+void reg_service(struct svc_req *, SVCXPRT *);
+void reap(void);
+void callit(struct svc_req *, SVCXPRT *);
+int check_callit(struct sockaddr_in *, u_long, u_long, u_long);
 
 struct pmaplist *pmaplist;
 int debugging = 0;
diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c
index 7d050ce47a4..60d5b4e49de 100644
--- a/usr.sbin/pppd/auth.c
+++ b/usr.sbin/pppd/auth.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auth.c,v 1.20 2001/07/09 22:21:54 pjanzen Exp $	*/
+/*	$OpenBSD: auth.c,v 1.21 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * auth.c - PPP authentication and phase control.
@@ -38,7 +38,7 @@
 #if 0
 static char rcsid[] = "Id: auth.c,v 1.37 1998/03/26 04:46:03 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: auth.c,v 1.20 2001/07/09 22:21:54 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: auth.c,v 1.21 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -129,25 +129,25 @@ static int passwd_from_file;
 #define CHAP_WITHPEER	4
 #define CHAP_PEER	8
 
-extern char *crypt __P((const char *, const char *));
+extern char *crypt(const char *, const char *);
 
 /* Prototypes for procedures local to this file. */
 
-static void network_phase __P((int));
-static void check_idle __P((void *));
-static void connect_time_expired __P((void *));
-static int  plogin __P((char *, char *, char **, int *));
-static void plogout __P((void));
-static int  null_login __P((int));
-static int  get_pap_passwd __P((char *));
-static int  have_pap_secret __P((void));
-static int  have_chap_secret __P((char *, char *, u_int32_t));
-static int  ip_addr_check __P((u_int32_t, struct wordlist *));
+static void network_phase(int);
+static void check_idle(void *);
+static void connect_time_expired(void *);
+static int  plogin(char *, char *, char **, int *);
+static void plogout(void);
+static int  null_login(int);
+static int  get_pap_passwd(char *);
+static int  have_pap_secret(void);
+static int  have_chap_secret(char *, char *, u_int32_t);
+static int  ip_addr_check(u_int32_t, struct wordlist *);
 static int  scan_authfile __P((FILE *, char *, char *, u_int32_t, char *,
 			       struct wordlist **, char *));
-static void free_wordlist __P((struct wordlist *));
-static void auth_script __P((char *));
-static void set_allowed_addrs __P((int, struct wordlist *));
+static void free_wordlist(struct wordlist *);
+static void auth_script(char *);
+static void set_allowed_addrs(int, struct wordlist *);
 
 /*
  * An Open on LCP has requested a change from Dead to Establish phase.
diff --git a/usr.sbin/pppd/cbcp.c b/usr.sbin/pppd/cbcp.c
index 6c98ff29232..439d73a8395 100644
--- a/usr.sbin/pppd/cbcp.c
+++ b/usr.sbin/pppd/cbcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cbcp.c,v 1.2 1997/09/05 04:32:33 millert Exp $	*/
+/*	$OpenBSD: cbcp.c,v 1.3 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * cbcp - Call Back Configuration Protocol.
@@ -24,7 +24,7 @@
 #if 0
 static char rcsid[] = "Id: cbcp.c,v 1.2 1997/04/30 05:50:26 paulus Exp";
 #else
-static char rcsid[] = "$OpenBSD: cbcp.c,v 1.2 1997/09/05 04:32:33 millert Exp $";
+static char rcsid[] = "$OpenBSD: cbcp.c,v 1.3 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -43,13 +43,13 @@ static char rcsid[] = "$OpenBSD: cbcp.c,v 1.2 1997/09/05 04:32:33 millert Exp $"
 /*
  * Protocol entry points.
  */
-static void cbcp_init      __P((int unit));
-static void cbcp_open      __P((int unit));
-static void cbcp_lowerup   __P((int unit));
-static void cbcp_input     __P((int unit, u_char *pkt, int len));
-static void cbcp_protrej   __P((int unit));
+static void cbcp_init(int unit);
+static void cbcp_open(int unit);
+static void cbcp_lowerup(int unit);
+static void cbcp_input(int unit, u_char *pkt, int len);
+static void cbcp_protrej(int unit);
 static int  cbcp_printpkt  __P((u_char *pkt, int len,
-				void (*printer) __P((void *, char *, ...)),
+				void (*printer)(void *, char *, ...),
 				void *arg));
 
 struct protent cbcp_protent = {
@@ -74,11 +74,11 @@ cbcp_state cbcp[NUM_PPP];
 
 /* internal prototypes */
 
-static void cbcp_recvreq __P((cbcp_state *us, char *pckt, int len));
-static void cbcp_resp __P((cbcp_state *us));
-static void cbcp_up __P((cbcp_state *us));
-static void cbcp_recvack __P((cbcp_state *us, char *pckt, int len));
-static void cbcp_send __P((cbcp_state *us, u_char code, u_char *buf, int len));
+static void cbcp_recvreq(cbcp_state *us, char *pckt, int len);
+static void cbcp_resp(cbcp_state *us);
+static void cbcp_up(cbcp_state *us);
+static void cbcp_recvack(cbcp_state *us, char *pckt, int len);
+static void cbcp_send(cbcp_state *us, u_char code, u_char *buf, int len);
 
 /* init state */
 static void
@@ -191,7 +191,7 @@ static int
 cbcp_printpkt(p, plen, printer, arg)
     u_char *p;
     int plen;
-    void (*printer) __P((void *, char *, ...));
+    void (*printer)(void *, char *, ...);
     void *arg;
 {
     int code, opt, id, len, olen, delay;
diff --git a/usr.sbin/pppd/ccp.c b/usr.sbin/pppd/ccp.c
index 74b75a92bd3..f9cfad3e793 100644
--- a/usr.sbin/pppd/ccp.c
+++ b/usr.sbin/pppd/ccp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccp.c,v 1.8 1998/05/08 04:52:19 millert Exp $	*/
+/*	$OpenBSD: ccp.c,v 1.9 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * ccp.c - PPP Compression Control Protocol.
@@ -31,7 +31,7 @@
 #if 0
 static char rcsid[] = "Id: ccp.c,v 1.22 1998/03/25 01:25:02 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ccp.c,v 1.8 1998/05/08 04:52:19 millert Exp $";
+static char rcsid[] = "$OpenBSD: ccp.c,v 1.9 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -48,17 +48,17 @@ static char rcsid[] = "$OpenBSD: ccp.c,v 1.8 1998/05/08 04:52:19 millert Exp $";
 /*
  * Protocol entry points from main code.
  */
-static void ccp_init __P((int unit));
-static void ccp_open __P((int unit));
-static void ccp_close __P((int unit, char *));
-static void ccp_lowerup __P((int unit));
-static void ccp_lowerdown __P((int));
-static void ccp_input __P((int unit, u_char *pkt, int len));
-static void ccp_protrej __P((int unit));
+static void ccp_init(int unit);
+static void ccp_open(int unit);
+static void ccp_close(int unit, char *);
+static void ccp_lowerup(int unit);
+static void ccp_lowerdown(int);
+static void ccp_input(int unit, u_char *pkt, int len);
+static void ccp_protrej(int unit);
 static int  ccp_printpkt __P((u_char *pkt, int len,
-			      void (*printer) __P((void *, char *, ...)),
+			      void (*printer)(void *, char *, ...),
 			      void *arg));
-static void ccp_datainput __P((int unit, u_char *pkt, int len));
+static void ccp_datainput(int unit, u_char *pkt, int len);
 
 struct protent ccp_protent = {
     PPP_CCP,
@@ -87,18 +87,18 @@ ccp_options ccp_hisoptions[NUM_PPP];	/* what we agreed to do */
 /*
  * Callbacks for fsm code.
  */
-static void ccp_resetci __P((fsm *));
-static int  ccp_cilen __P((fsm *));
-static void ccp_addci __P((fsm *, u_char *, int *));
-static int  ccp_ackci __P((fsm *, u_char *, int));
-static int  ccp_nakci __P((fsm *, u_char *, int));
-static int  ccp_rejci __P((fsm *, u_char *, int));
-static int  ccp_reqci __P((fsm *, u_char *, int *, int));
-static void ccp_up __P((fsm *));
-static void ccp_down __P((fsm *));
-static int  ccp_extcode __P((fsm *, int, int, u_char *, int));
-static void ccp_rack_timeout __P((void *));
-static char *method_name __P((ccp_options *, ccp_options *));
+static void ccp_resetci(fsm *);
+static int  ccp_cilen(fsm *);
+static void ccp_addci(fsm *, u_char *, int *);
+static int  ccp_ackci(fsm *, u_char *, int);
+static int  ccp_nakci(fsm *, u_char *, int);
+static int  ccp_rejci(fsm *, u_char *, int);
+static int  ccp_reqci(fsm *, u_char *, int *, int);
+static void ccp_up(fsm *);
+static void ccp_down(fsm *);
+static int  ccp_extcode(fsm *, int, int, u_char *, int);
+static void ccp_rack_timeout(void *);
+static char *method_name(ccp_options *, ccp_options *);
 
 static fsm_callbacks ccp_callbacks = {
     ccp_resetci,
@@ -960,7 +960,7 @@ static int
 ccp_printpkt(p, plen, printer, arg)
     u_char *p;
     int plen;
-    void (*printer) __P((void *, char *, ...));
+    void (*printer)(void *, char *, ...);
     void *arg;
 {
     u_char *p0, *optend;
diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c
index 6648526cf3a..cc2819530a0 100644
--- a/usr.sbin/pppd/chap.c
+++ b/usr.sbin/pppd/chap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chap.c,v 1.8 2001/06/23 15:34:02 lebel Exp $	*/
+/*	$OpenBSD: chap.c,v 1.9 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * chap.c - Challenge Handshake Authentication Protocol.
@@ -39,7 +39,7 @@
 #if 0
 static char rcsid[] = "Id: chap.c,v 1.15 1997/11/27 06:07:48 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: chap.c,v 1.8 2001/06/23 15:34:02 lebel Exp $";
+static char rcsid[] = "$OpenBSD: chap.c,v 1.9 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -64,13 +64,13 @@ static char rcsid[] = "$OpenBSD: chap.c,v 1.8 2001/06/23 15:34:02 lebel Exp $";
 /*
  * Protocol entry points.
  */
-static void ChapInit __P((int));
-static void ChapLowerUp __P((int));
-static void ChapLowerDown __P((int));
-static void ChapInput __P((int, u_char *, int));
-static void ChapProtocolReject __P((int));
+static void ChapInit(int);
+static void ChapLowerUp(int);
+static void ChapLowerDown(int);
+static void ChapInput(int, u_char *, int);
+static void ChapProtocolReject(int);
 static int  ChapPrintPkt __P((u_char *, int,
-			      void (*) __P((void *, char *, ...)), void *));
+			      void (*)(void *, char *, ...), void *));
 
 struct protent chap_protent = {
     PPP_CHAP,
@@ -92,20 +92,20 @@ struct protent chap_protent = {
 
 chap_state chap[NUM_PPP];		/* CHAP state; one for each unit */
 
-static void ChapChallengeTimeout __P((void *));
-static void ChapResponseTimeout __P((void *));
-static void ChapReceiveChallenge __P((chap_state *, u_char *, int, int));
-static void ChapRechallenge __P((void *));
-static void ChapReceiveResponse __P((chap_state *, u_char *, int, int));
-static void ChapReceiveSuccess __P((chap_state *, u_char *, int, int));
-static void ChapReceiveFailure __P((chap_state *, u_char *, int, int));
-static void ChapSendStatus __P((chap_state *, int));
-static void ChapSendChallenge __P((chap_state *));
-static void ChapSendResponse __P((chap_state *));
-static void ChapGenChallenge __P((chap_state *));
-
-extern double drand48 __P((void));
-extern void srand48 __P((long));
+static void ChapChallengeTimeout(void *);
+static void ChapResponseTimeout(void *);
+static void ChapReceiveChallenge(chap_state *, u_char *, int, int);
+static void ChapRechallenge(void *);
+static void ChapReceiveResponse(chap_state *, u_char *, int, int);
+static void ChapReceiveSuccess(chap_state *, u_char *, int, int);
+static void ChapReceiveFailure(chap_state *, u_char *, int, int);
+static void ChapSendStatus(chap_state *, int);
+static void ChapSendChallenge(chap_state *);
+static void ChapSendResponse(chap_state *);
+static void ChapGenChallenge(chap_state *);
+
+extern double drand48(void);
+extern void srand48(long);
 
 /*
  * ChapInit - Initialize a CHAP unit.
@@ -820,7 +820,7 @@ static int
 ChapPrintPkt(p, plen, printer, arg)
     u_char *p;
     int plen;
-    void (*printer) __P((void *, char *, ...));
+    void (*printer)(void *, char *, ...);
     void *arg;
 {
     int code, id, len;
diff --git a/usr.sbin/pppd/chap.h b/usr.sbin/pppd/chap.h
index 115ea46d0d2..fe9bd07c564 100644
--- a/usr.sbin/pppd/chap.h
+++ b/usr.sbin/pppd/chap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chap.h,v 1.6 1997/09/05 04:32:35 millert Exp $	*/
+/*	$OpenBSD: chap.h,v 1.7 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * chap.h - Challenge Handshake Authentication Protocol definitions.
@@ -117,8 +117,8 @@ typedef struct chap_state {
 
 extern chap_state chap[];
 
-void ChapAuthWithPeer __P((int, char *, int));
-void ChapAuthPeer __P((int, char *, int));
+void ChapAuthWithPeer(int, char *, int);
+void ChapAuthPeer(int, char *, int);
 
 extern struct protent chap_protent;
 
diff --git a/usr.sbin/pppd/chap_ms.c b/usr.sbin/pppd/chap_ms.c
index c7525a33e84..e1cc58204ab 100644
--- a/usr.sbin/pppd/chap_ms.c
+++ b/usr.sbin/pppd/chap_ms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chap_ms.c,v 1.5 1998/05/08 04:52:22 millert Exp $	*/
+/*	$OpenBSD: chap_ms.c,v 1.6 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * chap_ms.c - Microsoft MS-CHAP compatible implementation.
@@ -37,7 +37,7 @@
 #if 0
 static char rcsid[] = "Id: chap_ms.c,v 1.8 1998/04/01 00:15:43 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: chap_ms.c,v 1.5 1998/05/08 04:52:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: chap_ms.c,v 1.6 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -72,18 +72,18 @@ typedef struct {
    in case this struct gets padded. */
 
 
-static void	ChallengeResponse __P((u_char *, u_char *, u_char *));
-static void	DesEncrypt __P((u_char *, u_char *, u_char *));
-static void	MakeKey __P((u_char *, u_char *));
-static u_char	Get7Bits __P((u_char *, int));
-static void	ChapMS_NT __P((char *, int, char *, int, MS_ChapResponse *));
+static void	ChallengeResponse(u_char *, u_char *, u_char *);
+static void	DesEncrypt(u_char *, u_char *, u_char *);
+static void	MakeKey(u_char *, u_char *);
+static u_char	Get7Bits(u_char *, int);
+static void	ChapMS_NT(char *, int, char *, int, MS_ChapResponse *);
 #ifdef MSLANMAN
-static void	ChapMS_LANMan __P((char *, int, char *, int, MS_ChapResponse *));
+static void	ChapMS_LANMan(char *, int, char *, int, MS_ChapResponse *);
 #endif
 
 #ifdef USE_CRYPT
-static void	Expand __P((u_char *, u_char *));
-static void	Collapse __P((u_char *, u_char *));
+static void	Expand(u_char *, u_char *);
+static void	Collapse(u_char *, u_char *);
 #endif
 
 static void
diff --git a/usr.sbin/pppd/chap_ms.h b/usr.sbin/pppd/chap_ms.h
index a5a78858923..62512bc3baf 100644
--- a/usr.sbin/pppd/chap_ms.h
+++ b/usr.sbin/pppd/chap_ms.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chap_ms.h,v 1.3 1998/01/17 20:30:20 millert Exp $	*/
+/*	$OpenBSD: chap_ms.h,v 1.4 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * chap.h - Challenge Handshake Authentication Protocol definitions.
@@ -29,7 +29,7 @@
 #define MD4_SIGNATURE_SIZE	16	/* 16 bytes in a MD4 message digest */
 #define MAX_NT_PASSWORD	256	/* Maximum number of (Unicode) chars in an NT password */
 
-void ChapMS __P((chap_state *, char *, int, char *, int));
+void ChapMS(chap_state *, char *, int, char *, int);
 
 #define __CHAPMS_INCLUDE__
 #endif /* __CHAPMS_INCLUDE__ */
diff --git a/usr.sbin/pppd/chat/chat.c b/usr.sbin/pppd/chat/chat.c
index c61cbf56974..8b927b4ba4f 100644
--- a/usr.sbin/pppd/chat/chat.c
+++ b/usr.sbin/pppd/chat/chat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chat.c,v 1.13 2001/09/05 22:32:46 deraadt Exp $	*/
+/*	$OpenBSD: chat.c,v 1.14 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  *	Chat -- a program for automatic session establishment (i.e. dial
@@ -83,7 +83,7 @@
 #if 0
 static char rcsid[] = "Id: chat.c,v 1.19 1998/03/24 23:57:48 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: chat.c,v 1.13 2001/09/05 22:32:46 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: chat.c,v 1.14 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -193,38 +193,38 @@ int clear_report_next = 0;
 
 int say_next = 0, hup_next = 0;
 
-void *dup_mem __P((void *b, size_t c));
-void *copy_of __P((char *s));
-void usage __P((void));
-void logf __P((const char *fmt, ...));
-void fatal __P((int code, const char *fmt, ...));
-SIGTYPE sigalrm __P((int signo));
-SIGTYPE sigint __P((int signo));
-SIGTYPE sigterm __P((int signo));
-SIGTYPE sighup __P((int signo));
-void unalarm __P((void));
-void init __P((void));
-void set_tty_parameters __P((void));
-void echo_stderr __P((int));
-void break_sequence __P((void));
-void terminate __P((int status));
-void do_file __P((char *chat_file));
-int  get_string __P((register char *string));
-int  put_string __P((register char *s));
-int  write_char __P((int c));
-int  put_char __P((int c));
-int  get_char __P((void));
-void chat_send __P((register char *s));
-char *character __P((int c));
-void chat_expect __P((register char *s));
-char *clean __P((register char *s, int sending));
-void break_sequence __P((void));
-void terminate __P((int status));
-void pack_array __P((char **array, int end));
-char *expect_strtok __P((char *, char *));
-int vfmtmsg __P((char *, int, const char *, va_list));	/* vsprintf++ */
-
-int main __P((int, char *[]));
+void *dup_mem(void *b, size_t c);
+void *copy_of(char *s);
+void usage(void);
+void logf(const char *fmt, ...);
+void fatal(int code, const char *fmt, ...);
+SIGTYPE sigalrm(int signo);
+SIGTYPE sigint(int signo);
+SIGTYPE sigterm(int signo);
+SIGTYPE sighup(int signo);
+void unalarm(void);
+void init(void);
+void set_tty_parameters(void);
+void echo_stderr(int);
+void break_sequence(void);
+void terminate(int status);
+void do_file(char *chat_file);
+int  get_string(register char *string);
+int  put_string(register char *s);
+int  write_char(int c);
+int  put_char(int c);
+int  get_char(void);
+void chat_send(register char *s);
+char *character(int c);
+void chat_expect(register char *s);
+char *clean(register char *s, int sending);
+void break_sequence(void);
+void terminate(int status);
+void pack_array(char **array, int end);
+char *expect_strtok(char *, char *);
+int vfmtmsg(char *, int, const char *, va_list);	/* vsprintf++ */
+
+int main(int, char *[]);
 
 void *dup_mem(b, c)
 void *b;
diff --git a/usr.sbin/pppd/demand.c b/usr.sbin/pppd/demand.c
index 2f5de37bf33..cb9f64597ce 100644
--- a/usr.sbin/pppd/demand.c
+++ b/usr.sbin/pppd/demand.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: demand.c,v 1.6 1998/07/12 04:34:39 angelos Exp $	*/
+/*	$OpenBSD: demand.c,v 1.7 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * demand.c - Support routines for demand-dialling.
@@ -23,7 +23,7 @@
 #if 0
 static char rcsid[] = "Id: demand.c,v 1.7 1997/11/27 06:08:26 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: demand.c,v 1.6 1998/07/12 04:34:39 angelos Exp $";
+static char rcsid[] = "$OpenBSD: demand.c,v 1.7 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -68,7 +68,7 @@ struct packet {
 struct packet *pend_q;
 struct packet *pend_qtail;
 
-static int active_packet __P((unsigned char *, int));
+static int active_packet(unsigned char *, int);
 
 /*
  * demand_conf - configure the interface for doing dial-on-demand.
diff --git a/usr.sbin/pppd/fsm.c b/usr.sbin/pppd/fsm.c
index 23eeb1bb290..d5c0f1c850b 100644
--- a/usr.sbin/pppd/fsm.c
+++ b/usr.sbin/pppd/fsm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsm.c,v 1.5 1998/01/17 20:30:22 millert Exp $	*/
+/*	$OpenBSD: fsm.c,v 1.6 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * fsm.c - {Link, IP} Control Protocol Finite State Machine.
@@ -23,7 +23,7 @@
 #if 0
 static char rcsid[] = "Id: fsm.c,v 1.13 1997/04/30 05:52:17 paulus Exp";
 #else
-static char rcsid[] = "$OpenBSD: fsm.c,v 1.5 1998/01/17 20:30:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: fsm.c,v 1.6 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -41,14 +41,14 @@ static char rcsid[] = "$OpenBSD: fsm.c,v 1.5 1998/01/17 20:30:22 millert Exp $";
 #include "pppd.h"
 #include "fsm.h"
 
-static void fsm_timeout __P((void *));
-static void fsm_rconfreq __P((fsm *, int, u_char *, int));
-static void fsm_rconfack __P((fsm *, int, u_char *, int));
-static void fsm_rconfnakrej __P((fsm *, int, int, u_char *, int));
-static void fsm_rtermreq __P((fsm *, int, u_char *, int));
-static void fsm_rtermack __P((fsm *));
-static void fsm_rcoderej __P((fsm *, u_char *, int));
-static void fsm_sconfreq __P((fsm *, int));
+static void fsm_timeout(void *);
+static void fsm_rconfreq(fsm *, int, u_char *, int);
+static void fsm_rconfack(fsm *, int, u_char *, int);
+static void fsm_rconfnakrej(fsm *, int, int, u_char *, int);
+static void fsm_rtermreq(fsm *, int, u_char *, int);
+static void fsm_rtermack(fsm *);
+static void fsm_rcoderej(fsm *, u_char *, int);
+static void fsm_sconfreq(fsm *, int);
 
 #define PROTO_NAME(f)	((f)->callbacks->proto_name)
 
@@ -514,7 +514,7 @@ fsm_rconfnakrej(f, code, id, inp, len)
     u_char *inp;
     int len;
 {
-    int (*proc) __P((fsm *, u_char *, int));
+    int (*proc)(fsm *, u_char *, int);
     int ret;
 
     FSMDEBUG((LOG_INFO, "fsm_rconfnakrej(%s): Rcvd id %d.",
diff --git a/usr.sbin/pppd/fsm.h b/usr.sbin/pppd/fsm.h
index eac650e57f1..e6f7e96f633 100644
--- a/usr.sbin/pppd/fsm.h
+++ b/usr.sbin/pppd/fsm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsm.h,v 1.3 1997/09/05 04:32:38 millert Exp $	*/
+/*	$OpenBSD: fsm.h,v 1.4 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * fsm.h - {Link, IP} Control Protocol Finite State Machine definitions.
@@ -64,33 +64,33 @@ typedef struct fsm {
 
 typedef struct fsm_callbacks {
     void (*resetci)		/* Reset our Configuration Information */
-		__P((fsm *));
+(fsm *);
     int  (*cilen)		/* Length of our Configuration Information */
-		__P((fsm *));
+(fsm *);
     void (*addci) 		/* Add our Configuration Information */
-		__P((fsm *, u_char *, int *));
+(fsm *, u_char *, int *);
     int  (*ackci)		/* ACK our Configuration Information */
-		__P((fsm *, u_char *, int));
+(fsm *, u_char *, int);
     int  (*nakci)		/* NAK our Configuration Information */
-		__P((fsm *, u_char *, int));
+(fsm *, u_char *, int);
     int  (*rejci)		/* Reject our Configuration Information */
-		__P((fsm *, u_char *, int));
+(fsm *, u_char *, int);
     int  (*reqci)		/* Request peer's Configuration Information */
-		__P((fsm *, u_char *, int *, int));
+(fsm *, u_char *, int *, int);
     void (*up)			/* Called when fsm reaches OPENED state */
-		__P((fsm *));
+(fsm *);
     void (*down)		/* Called when fsm leaves OPENED state */
-		__P((fsm *));
+(fsm *);
     void (*starting)		/* Called when we want the lower layer */
-		__P((fsm *));
+(fsm *);
     void (*finished)		/* Called when we don't want the lower layer */
-		__P((fsm *));
+(fsm *);
     void (*protreject)		/* Called when Protocol-Reject received */
-		__P((int));
+(int);
     void (*retransmit)		/* Retransmission is necessary */
-		__P((fsm *));
+(fsm *);
     int  (*extcode)		/* Called when unknown code received */
-		__P((fsm *, int, int, u_char *, int));
+(fsm *, int, int, u_char *, int);
     char *proto_name;		/* String name for protocol (for messages) */
 } fsm_callbacks;
 
@@ -130,14 +130,14 @@ typedef struct fsm_callbacks {
 /*
  * Prototypes
  */
-void fsm_init __P((fsm *));
-void fsm_lowerup __P((fsm *));
-void fsm_lowerdown __P((fsm *));
-void fsm_open __P((fsm *));
-void fsm_close __P((fsm *, char *));
-void fsm_input __P((fsm *, u_char *, int));
-void fsm_protreject __P((fsm *));
-void fsm_sdata __P((fsm *, int, int, u_char *, int));
+void fsm_init(fsm *);
+void fsm_lowerup(fsm *);
+void fsm_lowerdown(fsm *);
+void fsm_open(fsm *);
+void fsm_close(fsm *, char *);
+void fsm_input(fsm *, u_char *, int);
+void fsm_protreject(fsm *);
+void fsm_sdata(fsm *, int, int, u_char *, int);
 
 
 /*
diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c
index df4e2eabd76..424b20c58b1 100644
--- a/usr.sbin/pppd/ipcp.c
+++ b/usr.sbin/pppd/ipcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipcp.c,v 1.6 1998/05/08 04:52:23 millert Exp $	*/
+/*	$OpenBSD: ipcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * ipcp.c - PPP IP Control Protocol.
@@ -23,7 +23,7 @@
 #if 0
 static char rcsid[] = "Id: ipcp.c,v 1.34 1998/04/28 23:38:09 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ipcp.c,v 1.6 1998/05/08 04:52:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: ipcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -59,17 +59,17 @@ static int proxy_arp_set[NUM_PPP];	/* Have created proxy arp entry */
 /*
  * Callbacks for fsm code.  (CI = Configuration Information)
  */
-static void ipcp_resetci __P((fsm *));	/* Reset our CI */
-static int  ipcp_cilen __P((fsm *));	        /* Return length of our CI */
-static void ipcp_addci __P((fsm *, u_char *, int *)); /* Add our CI */
-static int  ipcp_ackci __P((fsm *, u_char *, int));	/* Peer ack'd our CI */
-static int  ipcp_nakci __P((fsm *, u_char *, int));	/* Peer nak'd our CI */
-static int  ipcp_rejci __P((fsm *, u_char *, int));	/* Peer rej'd our CI */
-static int  ipcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv CI */
-static void ipcp_up __P((fsm *));		/* We're UP */
-static void ipcp_down __P((fsm *));		/* We're DOWN */
-static void ipcp_script __P((fsm *, char *)); /* Run an up/down script */
-static void ipcp_finished __P((fsm *));	/* Don't need lower layer */
+static void ipcp_resetci(fsm *);	/* Reset our CI */
+static int  ipcp_cilen(fsm *);	        /* Return length of our CI */
+static void ipcp_addci(fsm *, u_char *, int *);	/* Add our CI */
+static int  ipcp_ackci(fsm *, u_char *, int);	/* Peer ack'd our CI */
+static int  ipcp_nakci(fsm *, u_char *, int);	/* Peer nak'd our CI */
+static int  ipcp_rejci(fsm *, u_char *, int);	/* Peer rej'd our CI */
+static int  ipcp_reqci(fsm *, u_char *, int *, int); /* Rcv CI */
+static void ipcp_up(fsm *);		/* We're UP */
+static void ipcp_down(fsm *);		/* We're DOWN */
+static void ipcp_script(fsm *, char *); /* Run an up/down script */
+static void ipcp_finished(fsm *);	/* Don't need lower layer */
 
 fsm ipcp_fsm[NUM_PPP];		/* IPCP fsm structure */
 
@@ -94,18 +94,18 @@ static fsm_callbacks ipcp_callbacks = { /* IPCP callback routines */
 /*
  * Protocol entry points from main code.
  */
-static void ipcp_init __P((int));
-static void ipcp_open __P((int));
-static void ipcp_close __P((int, char *));
-static void ipcp_lowerup __P((int));
-static void ipcp_lowerdown __P((int));
-static void ipcp_input __P((int, u_char *, int));
-static void ipcp_protrej __P((int));
+static void ipcp_init(int);
+static void ipcp_open(int);
+static void ipcp_close(int, char *);
+static void ipcp_lowerup(int);
+static void ipcp_lowerdown(int);
+static void ipcp_input(int, u_char *, int);
+static void ipcp_protrej(int);
 static int  ipcp_printpkt __P((u_char *, int,
-			       void (*) __P((void *, char *, ...)), void *));
-static void ip_check_options __P((void));
-static int  ip_demand_conf __P((int));
-static int  ip_active_pkt __P((u_char *, int));
+			       void (*)(void *, char *, ...), void *));
+static void ip_check_options(void);
+static int  ip_demand_conf(int);
+static int  ip_active_pkt(u_char *, int);
 
 struct protent ipcp_protent = {
     PPP_IPCP,
@@ -125,7 +125,7 @@ struct protent ipcp_protent = {
     ip_active_pkt
 };
 
-static void ipcp_clear_addrs __P((int));
+static void ipcp_clear_addrs(int);
 
 /*
  * Lengths of configuration options.
@@ -1373,7 +1373,7 @@ static int
 ipcp_printpkt(p, plen, printer, arg)
     u_char *p;
     int plen;
-    void (*printer) __P((void *, char *, ...));
+    void (*printer)(void *, char *, ...);
     void *arg;
 {
     int code, id, len, olen;
diff --git a/usr.sbin/pppd/ipcp.h b/usr.sbin/pppd/ipcp.h
index a5143f2f623..dc0ff4cbbcc 100644
--- a/usr.sbin/pppd/ipcp.h
+++ b/usr.sbin/pppd/ipcp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipcp.h,v 1.5 1998/05/08 04:52:24 millert Exp $	*/
+/*	$OpenBSD: ipcp.h,v 1.6 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * ipcp.h - IP Control Protocol definitions.
@@ -67,6 +67,6 @@ extern ipcp_options ipcp_gotoptions[];
 extern ipcp_options ipcp_allowoptions[];
 extern ipcp_options ipcp_hisoptions[];
 
-char *ip_ntoa __P((u_int32_t));
+char *ip_ntoa(u_int32_t);
 
 extern struct protent ipcp_protent;
diff --git a/usr.sbin/pppd/ipxcp.c b/usr.sbin/pppd/ipxcp.c
index 7b36f2eccf9..081166b6c60 100644
--- a/usr.sbin/pppd/ipxcp.c
+++ b/usr.sbin/pppd/ipxcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipxcp.c,v 1.5 1998/05/08 04:52:25 millert Exp $	*/
+/*	$OpenBSD: ipxcp.c,v 1.6 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * ipxcp.c - PPP IPX Control Protocol.
@@ -24,7 +24,7 @@
 #if 0
 static char rcsid[] = "Id: ipxcp.c,v 1.6 1998/03/25 03:08:16 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ipxcp.c,v 1.5 1998/05/08 04:52:25 millert Exp $";
+static char rcsid[] = "$OpenBSD: ipxcp.c,v 1.6 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -59,16 +59,16 @@ ipxcp_options ipxcp_hisoptions[NUM_PPP];	/* Options that we ack'd */
 /*
  * Callbacks for fsm code.  (CI = Configuration Information)
  */
-static void ipxcp_resetci __P((fsm *));	/* Reset our CI */
-static int  ipxcp_cilen __P((fsm *));		/* Return length of our CI */
-static void ipxcp_addci __P((fsm *, u_char *, int *)); /* Add our CI */
-static int  ipxcp_ackci __P((fsm *, u_char *, int));	/* Peer ack'd our CI */
-static int  ipxcp_nakci __P((fsm *, u_char *, int));	/* Peer nak'd our CI */
-static int  ipxcp_rejci __P((fsm *, u_char *, int));	/* Peer rej'd our CI */
-static int  ipxcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv CI */
-static void ipxcp_up __P((fsm *));		/* We're UP */
-static void ipxcp_down __P((fsm *));		/* We're DOWN */
-static void ipxcp_script __P((fsm *, char *)); /* Run an up/down script */
+static void ipxcp_resetci(fsm *);	/* Reset our CI */
+static int  ipxcp_cilen(fsm *);		/* Return length of our CI */
+static void ipxcp_addci(fsm *, u_char *, int *); /* Add our CI */
+static int  ipxcp_ackci(fsm *, u_char *, int);	/* Peer ack'd our CI */
+static int  ipxcp_nakci(fsm *, u_char *, int);	/* Peer nak'd our CI */
+static int  ipxcp_rejci(fsm *, u_char *, int);	/* Peer rej'd our CI */
+static int  ipxcp_reqci(fsm *, u_char *, int *, int); /* Rcv CI */
+static void ipxcp_up(fsm *);		/* We're UP */
+static void ipxcp_down(fsm *);		/* We're DOWN */
+static void ipxcp_script(fsm *, char *); /* Run an up/down script */
 
 fsm ipxcp_fsm[NUM_PPP];		/* IPXCP fsm structure */
 
@@ -94,15 +94,15 @@ static fsm_callbacks ipxcp_callbacks = { /* IPXCP callback routines */
  * Protocol entry points.
  */
 
-static void ipxcp_init __P((int));
-static void ipxcp_open __P((int));
-static void ipxcp_close __P((int, char *));
-static void ipxcp_lowerup __P((int));
-static void ipxcp_lowerdown __P((int));
-static void ipxcp_input __P((int, u_char *, int));
-static void ipxcp_protrej __P((int));
+static void ipxcp_init(int);
+static void ipxcp_open(int);
+static void ipxcp_close(int, char *);
+static void ipxcp_lowerup(int);
+static void ipxcp_lowerdown(int);
+static void ipxcp_input(int, u_char *, int);
+static void ipxcp_protrej(int);
 static int  ipxcp_printpkt __P((u_char *, int,
-				void (*) __P((void *, char *, ...)), void *));
+				void (*)(void *, char *, ...), void *));
 
 struct protent ipxcp_protent = {
     PPP_IPXCP,
@@ -1283,7 +1283,7 @@ static int
 ipxcp_printpkt(p, plen, printer, arg)
     u_char *p;
     int plen;
-    void (*printer) __P((void *, char *, ...));
+    void (*printer)(void *, char *, ...);
     void *arg;
 {
     int code, id, len, olen;
diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c
index 5acc924395a..fa8fd8f60dc 100644
--- a/usr.sbin/pppd/lcp.c
+++ b/usr.sbin/pppd/lcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcp.c,v 1.6 1998/01/17 20:30:24 millert Exp $	*/
+/*	$OpenBSD: lcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * lcp.c - PPP Link Control Protocol.
@@ -23,7 +23,7 @@
 #if 0
 static char rcsid[] = "Id: lcp.c,v 1.31 1997/11/27 06:08:44 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: lcp.c,v 1.6 1998/01/17 20:30:24 millert Exp $";
+static char rcsid[] = "$OpenBSD: lcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -64,31 +64,31 @@ static u_char nak_buffer[PPP_MRU];	/* where we construct a nak packet */
 /*
  * Callbacks for fsm code.  (CI = Configuration Information)
  */
-static void lcp_resetci __P((fsm *));	/* Reset our CI */
-static int  lcp_cilen __P((fsm *));		/* Return length of our CI */
-static void lcp_addci __P((fsm *, u_char *, int *)); /* Add our CI to pkt */
-static int  lcp_ackci __P((fsm *, u_char *, int)); /* Peer ack'd our CI */
-static int  lcp_nakci __P((fsm *, u_char *, int)); /* Peer nak'd our CI */
-static int  lcp_rejci __P((fsm *, u_char *, int)); /* Peer rej'd our CI */
-static int  lcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv peer CI */
-static void lcp_up __P((fsm *));		/* We're UP */
-static void lcp_down __P((fsm *));		/* We're DOWN */
-static void lcp_starting __P((fsm *));	/* We need lower layer up */
-static void lcp_finished __P((fsm *));	/* We need lower layer down */
-static int  lcp_extcode __P((fsm *, int, int, u_char *, int));
-static void lcp_rprotrej __P((fsm *, u_char *, int));
+static void lcp_resetci(fsm *);		/* Reset our CI */
+static int  lcp_cilen(fsm *);		/* Return length of our CI */
+static void lcp_addci(fsm *, u_char *, int *); /* Add our CI to pkt */
+static int  lcp_ackci(fsm *, u_char *, int); /* Peer ack'd our CI */
+static int  lcp_nakci(fsm *, u_char *, int); /* Peer nak'd our CI */
+static int  lcp_rejci(fsm *, u_char *, int); /* Peer rej'd our CI */
+static int  lcp_reqci(fsm *, u_char *, int *, int); /* Rcv peer CI */
+static void lcp_up(fsm *);		/* We're UP */
+static void lcp_down(fsm *);		/* We're DOWN */
+static void lcp_starting(fsm *);	/* We need lower layer up */
+static void lcp_finished(fsm *);	/* We need lower layer down */
+static int  lcp_extcode(fsm *, int, int, u_char *, int);
+static void lcp_rprotrej(fsm *, u_char *, int);
 
 /*
  * routines to send LCP echos to peer
  */
 
-static void lcp_echo_lowerup __P((int));
-static void lcp_echo_lowerdown __P((int));
-static void LcpEchoTimeout __P((void *));
-static void lcp_received_echo_reply __P((fsm *, int, u_char *, int));
-static void LcpSendEchoRequest __P((fsm *));
-static void LcpLinkFailure __P((fsm *));
-static void LcpEchoCheck __P((fsm *));
+static void lcp_echo_lowerup(int);
+static void lcp_echo_lowerdown(int);
+static void LcpEchoTimeout(void *);
+static void lcp_received_echo_reply(fsm *, int, u_char *, int);
+static void LcpSendEchoRequest(fsm *);
+static void LcpLinkFailure(fsm *);
+static void LcpEchoCheck(fsm *);
 
 static fsm_callbacks lcp_callbacks = {	/* LCP callback routines */
     lcp_resetci,		/* Reset our Configuration Information */
@@ -113,11 +113,11 @@ static fsm_callbacks lcp_callbacks = {	/* LCP callback routines */
  * Some of these are called directly.
  */
 
-static void lcp_init __P((int));
-static void lcp_input __P((int, u_char *, int));
-static void lcp_protrej __P((int));
+static void lcp_init(int);
+static void lcp_input(int, u_char *, int);
+static void lcp_protrej(int);
 static int  lcp_printpkt __P((u_char *, int,
-			      void (*) __P((void *, char *, ...)), void *));
+			      void (*)(void *, char *, ...), void *));
 
 struct protent lcp_protent = {
     PPP_LCP,
@@ -1561,7 +1561,7 @@ static int
 lcp_printpkt(p, plen, printer, arg)
     u_char *p;
     int plen;
-    void (*printer) __P((void *, char *, ...));
+    void (*printer)(void *, char *, ...);
     void *arg;
 {
     int code, id, len, olen;
diff --git a/usr.sbin/pppd/lcp.h b/usr.sbin/pppd/lcp.h
index 727b2de00bc..3a26937463b 100644
--- a/usr.sbin/pppd/lcp.h
+++ b/usr.sbin/pppd/lcp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcp.h,v 1.5 1997/09/05 04:32:41 millert Exp $	*/
+/*	$OpenBSD: lcp.h,v 1.6 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * lcp.h - Link Control Protocol definitions.
@@ -77,11 +77,11 @@ extern u_int32_t xmit_accm[][8];
 #define MINMRU	128		/* No MRUs below this */
 #define MAXMRU	16384		/* Normally limit MRU to this */
 
-void lcp_open __P((int));
-void lcp_close __P((int, char *));
-void lcp_lowerup __P((int));
-void lcp_lowerdown __P((int));
-void lcp_sprotrej __P((int, u_char *, int));	/* send protocol reject */
+void lcp_open(int);
+void lcp_close(int, char *);
+void lcp_lowerup(int);
+void lcp_lowerdown(int);
+void lcp_sprotrej(int, u_char *, int);	/* send protocol reject */
 
 extern struct protent lcp_protent;
 
diff --git a/usr.sbin/pppd/magic.c b/usr.sbin/pppd/magic.c
index 7728ec06fa4..0fef78c87e2 100644
--- a/usr.sbin/pppd/magic.c
+++ b/usr.sbin/pppd/magic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: magic.c,v 1.4 1998/05/08 04:52:26 millert Exp $	*/
+/*	$OpenBSD: magic.c,v 1.5 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * magic.c - PPP Magic Number routines.
@@ -23,7 +23,7 @@
 #if 0
 static char rcsid[] = "Id: magic.c,v 1.7 1998/03/25 03:07:49 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: magic.c,v 1.4 1998/05/08 04:52:26 millert Exp $";
+static char rcsid[] = "$OpenBSD: magic.c,v 1.5 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -35,8 +35,8 @@ static char rcsid[] = "$OpenBSD: magic.c,v 1.4 1998/05/08 04:52:26 millert Exp $
 #include "pppd.h"
 #include "magic.h"
 
-extern long mrand48 __P((void));
-extern void srand48 __P((long));
+extern long mrand48(void);
+extern void srand48(long);
 
 /*
  * magic_init - Initialize the magic number generator.
diff --git a/usr.sbin/pppd/magic.h b/usr.sbin/pppd/magic.h
index ec990214457..80149796942 100644
--- a/usr.sbin/pppd/magic.h
+++ b/usr.sbin/pppd/magic.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: magic.h,v 1.2 1997/09/05 04:32:42 millert Exp $	*/
+/*	$OpenBSD: magic.h,v 1.3 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * magic.h - PPP Magic Number definitions.
@@ -21,5 +21,5 @@
  * Id: magic.h,v 1.3 1994/09/21 06:47:37 paulus Exp
  */
 
-void magic_init __P((void));	/* Initialize the magic number generator */
-u_int32_t magic __P((void));	/* Returns the next magic number */
+void magic_init(void);	/* Initialize the magic number generator */
+u_int32_t magic(void);	/* Returns the next magic number */
diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c
index ab67092be82..b1598b35a1b 100644
--- a/usr.sbin/pppd/main.c
+++ b/usr.sbin/pppd/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.32 2001/11/05 09:58:13 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.33 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * main.c - Point-to-Point Protocol main module
@@ -23,7 +23,7 @@
 #if 0
 static char rcsid[] = "Id: main.c,v 1.49 1998/05/05 05:24:17 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.32 2001/11/05 09:58:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.33 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -113,27 +113,27 @@ char *no_ppp_msg = "Sorry - this system lacks PPP kernel support\n";
 
 /* Prototypes for procedures local to this file. */
 
-static void create_pidfile __P((void));
-static void cleanup __P((void));
-static void close_tty __P((void));
-static void get_input __P((void));
-static void calltimeout __P((void));
-static struct timeval *timeleft __P((struct timeval *));
-static void kill_my_pg __P((int));
-static void hup __P((int));
-static void term __P((int));
-static void chld __P((int));
-static void toggle_debug __P((int));
-static void open_ccp __P((int));
-static void bad_signal __P((int));
-static void holdoff_end __P((void *));
-static int device_script __P((char *, int, int));
-static void reap_kids __P((void));
-static void pr_log __P((void *, char *, ...));
-
-extern	char	*ttyname __P((int));
-extern	char	*getlogin __P((void));
-int main __P((int, char *[]));
+static void create_pidfile(void);
+static void cleanup(void);
+static void close_tty(void);
+static void get_input(void);
+static void calltimeout(void);
+static struct timeval *timeleft(struct timeval *);
+static void kill_my_pg(int);
+static void hup(int);
+static void term(int);
+static void chld(int);
+static void toggle_debug(int);
+static void open_ccp(int);
+static void bad_signal(int);
+static void holdoff_end(void *);
+static int device_script(char *, int, int);
+static void reap_kids(void);
+static void pr_log(void *, char *, ...);
+
+extern	char	*ttyname(int);
+extern	char	*getlogin(void);
+int main(int, char *[]);
 
 #ifdef ultrix
 #undef	O_NONBLOCK
@@ -809,7 +809,7 @@ close_tty()
 struct	callout {
     struct timeval	c_time;		/* time at which to call routine */
     void		*c_arg;		/* argument to routine */
-    void		(*c_func) __P((void *)); /* routine */
+    void		(*c_func)(void *); /* routine */
     struct		callout *c_next;
 };
 
@@ -824,7 +824,7 @@ static struct timeval timenow;		/* Current time */
  */
 void
 timeout(func, arg, time)
-    void (*func) __P((void *));
+    void (*func)(void *);
     void *arg;
     int time;
 {
@@ -864,7 +864,7 @@ timeout(func, arg, time)
  */
 void
 untimeout(func, arg)
-    void (*func) __P((void *));
+    void (*func)(void *);
     void *arg;
 {
     struct callout **copp, *freep;
@@ -1266,7 +1266,7 @@ void
 format_packet(p, len, printer, arg)
     u_char *p;
     int len;
-    void (*printer) __P((void *, char *, ...));
+    void (*printer)(void *, char *, ...);
     void *arg;
 {
     int i, n;
@@ -1334,7 +1334,7 @@ void
 print_string(p, len, printer, arg)
     char *p;
     int len;
-    void (*printer) __P((void *, char *, ...));
+    void (*printer)(void *, char *, ...);
     void *arg;
 {
     int c;
diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c
index 348ac987849..e5fb33cb15d 100644
--- a/usr.sbin/pppd/options.c
+++ b/usr.sbin/pppd/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.14 2001/07/09 22:21:54 pjanzen Exp $	*/
+/*	$OpenBSD: options.c,v 1.15 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * options.c - handles option processing for PPP.
@@ -23,7 +23,7 @@
 #if 0
 static char rcsid[] = "Id: options.c,v 1.42 1998/03/26 04:46:06 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: options.c,v 1.14 2001/07/09 22:21:54 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: options.c,v 1.15 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -70,7 +70,7 @@ static char rcsid[] = "$OpenBSD: options.c,v 1.14 2001/07/09 22:21:54 pjanzen Ex
 #define TRUE	1
 
 #if defined(ultrix) || defined(NeXT)
-char *strdup __P((char *));
+char *strdup(char *);
 #endif
 
 #ifndef GIDSET_TYPE
@@ -139,133 +139,133 @@ pcap_t  pc;			/* Fake struct pcap so we can compile expr */
 /*
  * Prototypes
  */
-static int setdevname __P((char *, int));
-static int setipaddr __P((char *));
-static int setspeed __P((char *));
-static int setdebug __P((char **));
-static int setkdebug __P((char **));
-static int setpassive __P((char **));
-static int setsilent __P((char **));
-static int noopt __P((char **));
-static int setnovj __P((char **));
-static int setnovjccomp __P((char **));
-static int setvjslots __P((char **));
-static int reqpap __P((char **));
-static int nopap __P((char **));
+static int setdevname(char *, int);
+static int setipaddr(char *);
+static int setspeed(char *);
+static int setdebug(char **);
+static int setkdebug(char **);
+static int setpassive(char **);
+static int setsilent(char **);
+static int noopt(char **);
+static int setnovj(char **);
+static int setnovjccomp(char **);
+static int setvjslots(char **);
+static int reqpap(char **);
+static int nopap(char **);
 #ifdef OLD_OPTIONS
-static int setupapfile __P((char **));
+static int setupapfile(char **);
 #endif
-static int nochap __P((char **));
-static int reqchap __P((char **));
-static int noaccomp __P((char **));
-static int noasyncmap __P((char **));
-static int noip __P((char **));
-static int nomagicnumber __P((char **));
-static int setasyncmap __P((char **));
-static int setescape __P((char **));
-static int setmru __P((char **));
-static int setmtu __P((char **));
+static int nochap(char **);
+static int reqchap(char **);
+static int noaccomp(char **);
+static int noasyncmap(char **);
+static int noip(char **);
+static int nomagicnumber(char **);
+static int setasyncmap(char **);
+static int setescape(char **);
+static int setmru(char **);
+static int setmtu(char **);
 #ifdef CBCP_SUPPORT
-static int setcbcp __P((char **));
+static int setcbcp(char **);
 #endif
-static int nomru __P((char **));
-static int nopcomp __P((char **));
-static int setconnector __P((char **));
-static int setdisconnector __P((char **));
-static int setwelcomer __P((char **));
-static int setmaxconnect __P((char **));
-static int setdomain __P((char **));
-static int setnetmask __P((char **));
-static int setcrtscts __P((char **));
-static int setnocrtscts __P((char **));
-static int setxonxoff __P((char **));
-static int setnodetach __P((char **));
-static int setupdetach __P((char **));
-static int setmodem __P((char **));
-static int setmodem_chat __P((char **));
-static int setlocal __P((char **));
-static int setlock __P((char **));
-static int setname __P((char **));
-static int setuser __P((char **));
-static int setremote __P((char **));
-static int setauth __P((char **));
-static int setnoauth __P((char **));
-static int readfile __P((char **));
-static int callfile __P((char **));
-static int setdefaultroute __P((char **));
-static int setnodefaultroute __P((char **));
-static int setproxyarp __P((char **));
-static int setnoproxyarp __P((char **));
-static int setpersist __P((char **));
-static int setnopersist __P((char **));
-static int setdologin __P((char **));
-static int setusehostname __P((char **));
-static int setnoipdflt __P((char **));
-static int setlcptimeout __P((char **));
-static int setlcpterm __P((char **));
-static int setlcpconf __P((char **));
-static int setlcpfails __P((char **));
-static int setipcptimeout __P((char **));
-static int setipcpterm __P((char **));
-static int setipcpconf __P((char **));
-static int setipcpfails __P((char **));
-static int setpaptimeout __P((char **));
-static int setpapreqs __P((char **));
-static int setpapreqtime __P((char **));
-static int setchaptimeout __P((char **));
-static int setchapchal __P((char **));
-static int setchapintv __P((char **));
-static int setipcpaccl __P((char **));
-static int setipcpaccr __P((char **));
-static int setlcpechointv __P((char **));
-static int setlcpechofails __P((char **));
-static int noccp __P((char **));
-static int setbsdcomp __P((char **));
-static int setnobsdcomp __P((char **));
-static int setdeflate __P((char **));
-static int setnodeflate __P((char **));
-static int setnodeflatedraft __P((char **));
-static int setdemand __P((char **));
-static int setpred1comp __P((char **));
-static int setnopred1comp __P((char **));
-static int setipparam __P((char **));
-static int setpapcrypt __P((char **));
-static int setidle __P((char **));
-static int setholdoff __P((char **));
-static int setdnsaddr __P((char **));
-static int resetipxproto __P((char **));
-static int setwinsaddr __P((char **));
-static int showversion __P((char **));
-static int showhelp __P((char **));
+static int nomru(char **);
+static int nopcomp(char **);
+static int setconnector(char **);
+static int setdisconnector(char **);
+static int setwelcomer(char **);
+static int setmaxconnect(char **);
+static int setdomain(char **);
+static int setnetmask(char **);
+static int setcrtscts(char **);
+static int setnocrtscts(char **);
+static int setxonxoff(char **);
+static int setnodetach(char **);
+static int setupdetach(char **);
+static int setmodem(char **);
+static int setmodem_chat(char **);
+static int setlocal(char **);
+static int setlock(char **);
+static int setname(char **);
+static int setuser(char **);
+static int setremote(char **);
+static int setauth(char **);
+static int setnoauth(char **);
+static int readfile(char **);
+static int callfile(char **);
+static int setdefaultroute(char **);
+static int setnodefaultroute(char **);
+static int setproxyarp(char **);
+static int setnoproxyarp(char **);
+static int setpersist(char **);
+static int setnopersist(char **);
+static int setdologin(char **);
+static int setusehostname(char **);
+static int setnoipdflt(char **);
+static int setlcptimeout(char **);
+static int setlcpterm(char **);
+static int setlcpconf(char **);
+static int setlcpfails(char **);
+static int setipcptimeout(char **);
+static int setipcpterm(char **);
+static int setipcpconf(char **);
+static int setipcpfails(char **);
+static int setpaptimeout(char **);
+static int setpapreqs(char **);
+static int setpapreqtime(char **);
+static int setchaptimeout(char **);
+static int setchapchal(char **);
+static int setchapintv(char **);
+static int setipcpaccl(char **);
+static int setipcpaccr(char **);
+static int setlcpechointv(char **);
+static int setlcpechofails(char **);
+static int noccp(char **);
+static int setbsdcomp(char **);
+static int setnobsdcomp(char **);
+static int setdeflate(char **);
+static int setnodeflate(char **);
+static int setnodeflatedraft(char **);
+static int setdemand(char **);
+static int setpred1comp(char **);
+static int setnopred1comp(char **);
+static int setipparam(char **);
+static int setpapcrypt(char **);
+static int setidle(char **);
+static int setholdoff(char **);
+static int setdnsaddr(char **);
+static int resetipxproto(char **);
+static int setwinsaddr(char **);
+static int showversion(char **);
+static int showhelp(char **);
 
 #ifdef PPP_FILTER
-static int setpdebug __P((char **));
-static int setpassfilter __P((char **));
-static int setactivefilter __P((char **));
+static int setpdebug(char **);
+static int setpassfilter(char **);
+static int setactivefilter(char **);
 #endif
 
 #ifdef IPX_CHANGE
-static int setipxproto __P((char **));
-static int setipxanet __P((char **));
-static int setipxalcl __P((char **));
-static int setipxarmt __P((char **));
-static int setipxnetwork __P((char **));
-static int setipxnode __P((char **));
-static int setipxrouter __P((char **));
-static int setipxname __P((char **));
-static int setipxcptimeout __P((char **));
-static int setipxcpterm __P((char **));
-static int setipxcpconf __P((char **));
-static int setipxcpfails __P((char **));
+static int setipxproto(char **);
+static int setipxanet(char **);
+static int setipxalcl(char **);
+static int setipxarmt(char **);
+static int setipxnetwork(char **);
+static int setipxnode(char **);
+static int setipxrouter(char **);
+static int setipxname(char **);
+static int setipxcptimeout(char **);
+static int setipxcpterm(char **);
+static int setipxcpconf(char **);
+static int setipxcpfails(char **);
 #endif /* IPX_CHANGE */
 
 #ifdef MSLANMAN
-static int setmslanman __P((char **));
+static int setmslanman(char **);
 #endif
 
-static int number_option __P((char *, u_int32_t *, int));
-static int int_option __P((char *, int *));
-static int readable __P((int fd));
+static int number_option(char *, u_int32_t *, int);
+static int int_option(char *, int *);
+static int readable(int fd);
 
 /*
  * Valid arguments.
@@ -273,7 +273,7 @@ static int readable __P((int fd));
 static struct cmd {
     char *cmd_name;
     int num_args;
-    int (*cmd_func) __P((char **));
+    int (*cmd_func)(char **);
 } cmds[] = {
     {"-all", 0, noopt},		/* Don't request/allow any options (useless) */
     {"noaccomp", 0, noaccomp},	/* Disable Address/Control compression */
diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h
index dc7bba871cd..e9a83a306c3 100644
--- a/usr.sbin/pppd/pppd.h
+++ b/usr.sbin/pppd/pppd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pppd.h,v 1.10 1998/07/12 04:34:42 angelos Exp $	*/
+/*	$OpenBSD: pppd.h,v 1.11 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * pppd.h - PPP daemon global declarations.
@@ -142,33 +142,33 @@ extern int	ms_lanman;	/* Nonzero if use LanMan password instead of NT */
 struct protent {
     u_short protocol;		/* PPP protocol number */
     /* Initialization procedure */
-    void (*init) __P((int unit));
+    void (*init)(int unit);
     /* Process a received packet */
-    void (*input) __P((int unit, u_char *pkt, int len));
+    void (*input)(int unit, u_char *pkt, int len);
     /* Process a received protocol-reject */
-    void (*protrej) __P((int unit));
+    void (*protrej)(int unit);
     /* Lower layer has come up */
-    void (*lowerup) __P((int unit));
+    void (*lowerup)(int unit);
     /* Lower layer has gone down */
-    void (*lowerdown) __P((int unit));
+    void (*lowerdown)(int unit);
     /* Open the protocol */
-    void (*open) __P((int unit));
+    void (*open)(int unit);
     /* Close the protocol */
-    void (*close) __P((int unit, char *reason));
+    void (*close)(int unit, char *reason);
     /* Print a packet in readable form */
     int  (*printpkt) __P((u_char *pkt, int len,
-			  void (*printer) __P((void *, char *, ...)),
+			  void (*printer)(void *, char *, ...),
 			  void *arg));
     /* Process a received data packet */
-    void (*datainput) __P((int unit, u_char *pkt, int len));
+    void (*datainput)(int unit, u_char *pkt, int len);
     int  enabled_flag;		/* 0 iff protocol is disabled */
     char *name;			/* Text name of protocol */
     /* Check requested options, assign defaults */
-    void (*check_options) __P((void));
+    void (*check_options)(void);
     /* Configure interface for demand-dial */
-    int  (*demand_conf) __P((int unit));
+    int  (*demand_conf)(int unit);
     /* Say whether to bring up link for this pkt */
-    int  (*active_pkt) __P((u_char *pkt, int len));
+    int  (*active_pkt)(u_char *pkt, int len);
 };
 
 /* Table of pointers to supported protocols */
@@ -179,148 +179,148 @@ extern struct protent *protocols[];
  */
 
 /* Procedures exported from main.c. */
-void detach __P((void));	/* Detach from controlling tty */
-void die __P((int));		/* Cleanup and exit */
-void quit __P((void));		/* like die(1) */
-void novm __P((char *));	/* Say we ran out of memory, and die */
+void detach(void);		/* Detach from controlling tty */
+void die(int);			/* Cleanup and exit */
+void quit(void);		/* like die(1) */
+void novm(char *);		/* Say we ran out of memory, and die */
 void timeout __P((void (*func)(void *), void *arg, int t));
 				/* Call func(arg) after t seconds */
 void untimeout __P((void (*func)(void *), void *arg));
 				/* Cancel call to func(arg) */
-int run_program __P((char *prog, char **args, int must_exist));
+int run_program(char *prog, char **args, int must_exist);
 				/* Run program prog with args in child */
-void demuxprotrej __P((int, int));
+void demuxprotrej(int, int);
 				/* Demultiplex a Protocol-Reject */
 void format_packet __P((u_char *, int, void (*) (void *, char *, ...),
 		void *));	/* Format a packet in human-readable form */
-void log_packet __P((u_char *, int, char *, int));
+void log_packet(u_char *, int, char *, int);
 				/* Format a packet and log it with syslog */
 void print_string __P((char *, int,  void (*) (void *, char *, ...),
 		void *));	/* Format a string for output */
-int fmtmsg __P((char *, int, char *, ...));		/* sprintf++ */
-int vfmtmsg __P((char *, int, char *, va_list));	/* vsprintf++ */
-void script_setenv __P((char *, char *));	/* set script env var */
-void script_unsetenv __P((char *));		/* unset script env var */
+int fmtmsg(char *, int, char *, ...);		/* sprintf++ */
+int vfmtmsg(char *, int, char *, va_list);	/* vsprintf++ */
+void script_setenv(char *, char *);	/* set script env var */
+void script_unsetenv(char *);		/* unset script env var */
 
 /* Procedures exported from auth.c */
-void link_required __P((int));	  /* we are starting to use the link */
-void link_terminated __P((int));  /* we are finished with the link */
-void link_down __P((int));	  /* the LCP layer has left the Opened state */
-void link_established __P((int)); /* the link is up; authenticate now */
-void np_up __P((int, int));	  /* a network protocol has come up */
-void np_down __P((int, int));	  /* a network protocol has gone down */
-void np_finished __P((int, int)); /* a network protocol no longer needs link */
-void auth_peer_fail __P((int, int));
+void link_required(int);	/* we are starting to use the link */
+void link_terminated(int);	/* we are finished with the link */
+void link_down(int);		/* the LCP layer has left the Opened state */
+void link_established(int);	/* the link is up; authenticate now */
+void np_up(int, int);		/* a network protocol has come up */
+void np_down(int, int);		/* a network protocol has gone down */
+void np_finished(int, int);	/* a network protocol no longer needs link */
+void auth_peer_fail(int, int);
 				/* peer failed to authenticate itself */
-void auth_peer_success __P((int, int, char *, int));
+void auth_peer_success(int, int, char *, int);
 				/* peer successfully authenticated itself */
-void auth_withpeer_fail __P((int, int));
+void auth_withpeer_fail(int, int);
 				/* we failed to authenticate ourselves */
-void auth_withpeer_success __P((int, int));
+void auth_withpeer_success(int, int);
 				/* we successfully authenticated ourselves */
-void auth_check_options __P((void));
+void auth_check_options(void);
 				/* check authentication options supplied */
-void auth_reset __P((int));	/* check what secrets we have */
-int  check_passwd __P((int, char *, int, char *, int, char **, int *));
+void auth_reset(int);		/* check what secrets we have */
+int  check_passwd(int, char *, int, char *, int, char **, int *);
 				/* Check peer-supplied username/password */
-int  get_secret __P((int, char *, char *, char *, int *, int));
+int  get_secret(int, char *, char *, char *, int *, int);
 				/* get "secret" for chap */
-int  auth_ip_addr __P((int, u_int32_t));
+int  auth_ip_addr(int, u_int32_t);
 				/* check if IP address is authorized */
-int  bad_ip_adrs __P((u_int32_t));
+int  bad_ip_adrs(u_int32_t);
 				/* check if IP address is unreasonable */
-void check_access __P((FILE *, char *));
+void check_access(FILE *, char *);
 				/* check permissions on secrets file */
 
 /* Procedures exported from demand.c */
-void demand_conf __P((void));	/* config interface(s) for demand-dial */
-void demand_block __P((void));	/* set all NPs to queue up packets */
-void demand_drop __P((void)); 	/* set all NPs to drop packets */
-void demand_unblock __P((void)); /* set all NPs to pass packets */
-void demand_discard __P((void)); /* set all NPs to discard packets */
-void demand_rexmit __P((int));	/* retransmit saved frames for an NP */
-int  loop_chars __P((unsigned char *, int)); /* process chars from loopback */
-int  loop_frame __P((unsigned char *, int)); /* process frame from loopback */
+void demand_conf(void);		/* config interface(s) for demand-dial */
+void demand_block(void);	/* set all NPs to queue up packets */
+void demand_drop(void); 	/* set all NPs to drop packets */
+void demand_unblock(void);	/* set all NPs to pass packets */
+void demand_discard(void);	/* set all NPs to discard packets */
+void demand_rexmit(int);	/* retransmit saved frames for an NP */
+int  loop_chars(unsigned char *, int); /* process chars from loopback */
+int  loop_frame(unsigned char *, int); /* process frame from loopback */
 
 /* Procedures exported from sys-*.c */
-void sys_init __P((void));	/* Do system-dependent initialization */
-void sys_cleanup __P((void));	/* Restore system state before exiting */
-void sys_check_options __P((void)); /* Check options specified */
-void sys_close __P((void));	/* Clean up in a child before execing */
-int  ppp_available __P((void));	/* Test whether ppp kernel support exists */
-void open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */
-void establish_ppp __P((int));	/* Turn serial port into a ppp interface */
-void restore_loop __P((void));	/* Transfer ppp unit back to loopback */
-void disestablish_ppp __P((int)); /* Restore port to normal operation */
-void clean_check __P((void));	/* Check if line was 8-bit clean */
-void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */
-void restore_tty __P((int));	/* Restore port's original parameters */
-void setdtr __P((int, int));	/* Raise or lower port's DTR line */
-void output __P((int, u_char *, int)); /* Output a PPP packet */
-void wait_input __P((struct timeval *));
+void sys_init(void);		/* Do system-dependent initialization */
+void sys_cleanup(void);		/* Restore system state before exiting */
+void sys_check_options(void);	/* Check options specified */
+void sys_close(void);		/* Clean up in a child before execing */
+int  ppp_available(void);	/* Test whether ppp kernel support exists */
+void open_ppp_loopback(void);	/* Open loopback for demand-dialling */
+void establish_ppp(int);	/* Turn serial port into a ppp interface */
+void restore_loop(void);	/* Transfer ppp unit back to loopback */
+void disestablish_ppp(int);	/* Restore port to normal operation */
+void clean_check(void);		/* Check if line was 8-bit clean */
+void set_up_tty(int, int);	/* Set up port's speed, parameters, etc. */
+void restore_tty(int);		/* Restore port's original parameters */
+void setdtr(int, int);		/* Raise or lower port's DTR line */
+void output(int, u_char *, int); /* Output a PPP packet */
+void wait_input(struct timeval *);
 				/* Wait for input, with timeout */
-void wait_loop_output __P((struct timeval *));
+void wait_loop_output(struct timeval *);
 				/* Wait for pkt from loopback, with timeout */
-void wait_time __P((struct timeval *)); /* Wait for given length of time */
-int  read_packet __P((u_char *)); /* Read PPP packet */
-int  get_loop_output __P((void)); /* Read pkts from loopback */
-void ppp_send_config __P((int, int, u_int32_t, int, int));
+void wait_time(struct timeval *); /* Wait for given length of time */
+int  read_packet(u_char *);	/* Read PPP packet */
+int  get_loop_output(void);	/* Read pkts from loopback */
+void ppp_send_config(int, int, u_int32_t, int, int);
 				/* Configure i/f transmit parameters */
-void ppp_set_xaccm __P((int, ext_accm));
+void ppp_set_xaccm(int, ext_accm);
 				/* Set extended transmit ACCM */
-void ppp_recv_config __P((int, int, u_int32_t, int, int));
+void ppp_recv_config(int, int, u_int32_t, int, int);
 				/* Configure i/f receive parameters */
-int  ccp_test __P((int, u_char *, int, int));
+int  ccp_test(int, u_char *, int, int);
 				/* Test support for compression scheme */
-void ccp_flags_set __P((int, int, int));
+void ccp_flags_set(int, int, int);
 				/* Set kernel CCP state */
-int  ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */
-int  get_idle_time __P((int, struct ppp_idle *));
+int  ccp_fatal_error(int);	/* Test for fatal decomp error in kernel */
+int  get_idle_time(int, struct ppp_idle *);
 				/* Find out how long link has been idle */
-int  sifvjcomp __P((int, int, int, int));
+int  sifvjcomp(int, int, int, int);
 				/* Configure VJ TCP header compression */
-int  sifup __P((int));		/* Configure i/f up (for IP) */
-int  sifnpmode __P((int u, int proto, enum NPmode mode));
+int  sifup(int);		/* Configure i/f up (for IP) */
+int  sifnpmode(int u, int proto, enum NPmode mode);
 				/* Set mode for handling packets for proto */
-int  sifdown __P((int));	/* Configure i/f down (for IP) */
-int  sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t));
+int  sifdown(int);		/* Configure i/f down (for IP) */
+int  sifaddr(int, u_int32_t, u_int32_t, u_int32_t);
 				/* Configure IP addresses for i/f */
-int  cifaddr __P((int, u_int32_t, u_int32_t));
+int  cifaddr(int, u_int32_t, u_int32_t);
 				/* Reset i/f IP addresses */
-int  sifdefaultroute __P((int, u_int32_t, u_int32_t));
+int  sifdefaultroute(int, u_int32_t, u_int32_t);
 				/* Create default route through i/f */
-int  cifdefaultroute __P((int, u_int32_t, u_int32_t));
+int  cifdefaultroute(int, u_int32_t, u_int32_t);
 				/* Delete default route through i/f */
-int  sifproxyarp __P((int, u_int32_t));
+int  sifproxyarp(int, u_int32_t);
 				/* Add proxy ARP entry for peer */
-int  cifproxyarp __P((int, u_int32_t));
+int  cifproxyarp(int, u_int32_t);
 				/* Delete proxy ARP entry for peer */
-u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */
-int  lock __P((char *));	/* Create lock file for device */
-void unlock __P((void));	/* Delete previously-created lock file */
-int  daemon __P((int, int));	/* Detach us from terminal session */
-void logwtmp __P((const char *, const char *, const char *));
+u_int32_t GetMask(u_int32_t);	/* Get appropriate netmask for address */
+int  lock(char *);		/* Create lock file for device */
+void unlock(void);		/* Delete previously-created lock file */
+int  daemon(int, int);		/* Detach us from terminal session */
+void logwtmp(const char *, const char *, const char *);
 				/* Write entry to wtmp file */
-int  get_host_seed __P((void));	/* Get host-dependent random number seed */
+int  get_host_seed(void);	/* Get host-dependent random number seed */
 #ifdef PPP_FILTER
-int  set_filters __P((struct bpf_program *pass, struct bpf_program *active));
+int  set_filters(struct bpf_program *pass, struct bpf_program *active);
 				/* Set filter programs in kernel */
 #endif
 
 /* Procedures exported from options.c */
-int  parse_args __P((int argc, char **argv));
+int  parse_args(int argc, char **argv);
 				/* Parse options from arguments given */
-void usage __P((void));		/* Print a usage message */
+void usage(void);		/* Print a usage message */
 int  options_from_file __P((char *filename, int must_exist, int check_prot,
 			    int privileged));
 				/* Parse options from an options file */
-int  options_from_user __P((void)); /* Parse options from user's .ppprc */
-int  options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */
-void scan_args __P((int argc, char **argv));
+int  options_from_user(void);	/* Parse options from user's .ppprc */
+int  options_for_tty(void);	/* Parse options from /etc/ppp/options.tty */
+void scan_args(int argc, char **argv);
 				/* Look for tty name in command-line args */
-int  getword __P((FILE *f, char *word, int *newlinep, char *filename));
+int  getword(FILE *f, char *word, int *newlinep, char *filename);
 				/* Read a word from a file */
-void option_error __P((char *fmt, ...));
+void option_error(char *fmt, ...);
 				/* Print an error message about an option */
 
 /*
diff --git a/usr.sbin/pppd/pppstats/pppstats.c b/usr.sbin/pppd/pppstats/pppstats.c
index 5e23b402642..aa8b67fc65e 100644
--- a/usr.sbin/pppd/pppstats/pppstats.c
+++ b/usr.sbin/pppd/pppstats/pppstats.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pppstats.c,v 1.6 2001/08/09 08:45:31 deraadt Exp $	*/
+/*	$OpenBSD: pppstats.c,v 1.7 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * print PPP statistics:
@@ -37,7 +37,7 @@
 #if 0
 static char rcsid[] = "Id: pppstats.c,v 1.22 1998/03/31 23:48:03 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: pppstats.c,v 1.6 2001/08/09 08:45:31 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: pppstats.c,v 1.7 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -69,12 +69,12 @@ int	s;			/* socket file descriptor */
 int	signalled;		/* set if alarm goes off "early" */
 char	interface[IFNAMSIZ];
 
-void usage __P((void));
-void catchalarm __P((int));
-void get_ppp_stats __P((struct ppp_stats *));
-void get_ppp_cstats __P((struct ppp_comp_stats *));
-void intpr __P((void));
-int main __P((int, char *argv[]));
+void usage(void);
+void catchalarm(int);
+void get_ppp_stats(struct ppp_stats *);
+void get_ppp_cstats(struct ppp_comp_stats *);
+void intpr(void);
+int main(int, char *argv[]);
 
 void
 usage()
diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c
index 84450cbfced..8c079afb03d 100644
--- a/usr.sbin/pppd/sys-bsd.c
+++ b/usr.sbin/pppd/sys-bsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys-bsd.c,v 1.15 2001/06/23 15:34:02 lebel Exp $	*/
+/*	$OpenBSD: sys-bsd.c,v 1.16 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * sys-bsd.c - System-dependent procedures for setting up
@@ -26,7 +26,7 @@
 #if 0
 static char rcsid[] = "Id: sys-bsd.c,v 1.31 1998/04/02 12:04:19 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: sys-bsd.c,v 1.15 2001/06/23 15:34:02 lebel Exp $";
+static char rcsid[] = "$OpenBSD: sys-bsd.c,v 1.16 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -111,8 +111,8 @@ static u_int32_t default_route_gateway;	/* gateway addr for default route */
 static u_int32_t proxy_arp_addr;	/* remote addr for proxy arp */
 
 /* Prototypes for procedures local to this file. */
-static int dodefaultroute __P((u_int32_t, int));
-static int get_ether_addr __P((u_int32_t, struct sockaddr_dl *));
+static int dodefaultroute(u_int32_t, int);
+static int get_ether_addr(u_int32_t, struct sockaddr_dl *);
 
 
 /*
diff --git a/usr.sbin/pppd/upap.c b/usr.sbin/pppd/upap.c
index 20deee29f38..edb2d67f61a 100644
--- a/usr.sbin/pppd/upap.c
+++ b/usr.sbin/pppd/upap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: upap.c,v 1.6 1998/01/17 20:30:30 millert Exp $	*/
+/*	$OpenBSD: upap.c,v 1.7 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * upap.c - User/Password Authentication Protocol.
@@ -23,7 +23,7 @@
 #if 0
 static char rcsid[] = "Id: upap.c,v 1.11 1997/04/30 05:59:56 paulus Exp";
 #else
-static char rcsid[] = "$OpenBSD: upap.c,v 1.6 1998/01/17 20:30:30 millert Exp $";
+static char rcsid[] = "$OpenBSD: upap.c,v 1.7 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif
 
@@ -43,13 +43,13 @@ static char rcsid[] = "$OpenBSD: upap.c,v 1.6 1998/01/17 20:30:30 millert Exp $"
 /*
  * Protocol entry points.
  */
-static void upap_init __P((int));
-static void upap_lowerup __P((int));
-static void upap_lowerdown __P((int));
-static void upap_input __P((int, u_char *, int));
-static void upap_protrej __P((int));
+static void upap_init(int);
+static void upap_lowerup(int);
+static void upap_lowerdown(int);
+static void upap_input(int, u_char *, int);
+static void upap_protrej(int);
 static int  upap_printpkt __P((u_char *, int,
-			       void (*) __P((void *, char *, ...)), void *));
+			       void (*)(void *, char *, ...), void *));
 
 struct protent pap_protent = {
     PPP_PAP,
@@ -71,13 +71,13 @@ struct protent pap_protent = {
 
 upap_state upap[NUM_PPP];		/* UPAP state; one for each unit */
 
-static void upap_timeout __P((void *));
-static void upap_reqtimeout __P((void *));
-static void upap_rauthreq __P((upap_state *, u_char *, int, int));
-static void upap_rauthack __P((upap_state *, u_char *, int, int));
-static void upap_rauthnak __P((upap_state *, u_char *, int, int));
-static void upap_sauthreq __P((upap_state *));
-static void upap_sresp __P((upap_state *, int, int, char *, int));
+static void upap_timeout(void *);
+static void upap_reqtimeout(void *);
+static void upap_rauthreq(upap_state *, u_char *, int, int);
+static void upap_rauthack(upap_state *, u_char *, int, int);
+static void upap_rauthnak(upap_state *, u_char *, int, int);
+static void upap_sauthreq(upap_state *);
+static void upap_sresp(upap_state *, int, int, char *, int);
 
 
 /*
@@ -557,7 +557,7 @@ static int
 upap_printpkt(p, plen, printer, arg)
     u_char *p;
     int plen;
-    void (*printer) __P((void *, char *, ...));
+    void (*printer)(void *, char *, ...);
     void *arg;
 {
     int code, id, len;
diff --git a/usr.sbin/pppd/upap.h b/usr.sbin/pppd/upap.h
index f95a93a8ddb..86cfa5ef67c 100644
--- a/usr.sbin/pppd/upap.h
+++ b/usr.sbin/pppd/upap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: upap.h,v 1.4 1997/09/05 04:32:46 millert Exp $	*/
+/*	$OpenBSD: upap.h,v 1.5 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * upap.h - User/Password Authentication Protocol definitions.
@@ -83,7 +83,7 @@ typedef struct upap_state {
 
 extern upap_state upap[];
 
-void upap_authwithpeer __P((int, char *, char *));
-void upap_authpeer __P((int));
+void upap_authwithpeer(int, char *, char *);
+void upap_authpeer(int);
 
 extern struct protent pap_protent;
diff --git a/usr.sbin/pppoe/client.c b/usr.sbin/pppoe/client.c
index 30167f802f1..0d022c82eac 100644
--- a/usr.sbin/pppoe/client.c
+++ b/usr.sbin/pppoe/client.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: client.c,v 1.12 2001/11/17 19:54:57 deraadt Exp $	*/
+/*	$OpenBSD: client.c,v 1.13 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -68,7 +68,7 @@ int pppfd, client_state;
 
 static int getpackets __P((int, char *, char *, struct ether_addr *,
     struct ether_addr *));
-static int send_padi __P((int, struct ether_addr *, u_int8_t *));
+static int send_padi(int, struct ether_addr *, u_int8_t *);
 static int send_padr __P((int, char *, struct ether_addr *,
     struct ether_addr *, struct ether_header *, struct pppoe_header *,
     struct tag_list *));
@@ -81,10 +81,10 @@ static int recv_pads __P((int, char *, char *, struct ether_addr *,
 static int recv_padt __P((int, struct ether_addr *, struct ether_addr *,
     struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
 
-void timer_handler __P((int));
-int timer_set __P((u_int));
-int timer_clr __P((void));
-int timer_hit __P((void));
+void timer_handler(int);
+int timer_set(u_int);
+int timer_clr(void);
+int timer_hit(void);
 
 int
 client_mode(bfd, sysname, srvname, myea)
diff --git a/usr.sbin/pppoe/common.c b/usr.sbin/pppoe/common.c
index 0de402e942f..195e942cd42 100644
--- a/usr.sbin/pppoe/common.c
+++ b/usr.sbin/pppoe/common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: common.c,v 1.5 2001/07/09 07:05:04 deraadt Exp $	*/
+/*	$OpenBSD: common.c,v 1.6 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -61,7 +61,7 @@
 
 #define PPP_PROG	"/usr/sbin/ppp"
 
-void debugv __P((char *, struct iovec *, int));
+void debugv(char *, struct iovec *, int);
 
 int
 runppp(bpffd, sysname)
diff --git a/usr.sbin/pppoe/pppoe.c b/usr.sbin/pppoe/pppoe.c
index 6c6597bf98e..cc3451bb458 100644
--- a/usr.sbin/pppoe/pppoe.c
+++ b/usr.sbin/pppoe/pppoe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pppoe.c,v 1.6 2002/01/10 18:21:38 jason Exp $	*/
+/*	$OpenBSD: pppoe.c,v 1.7 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -59,12 +59,12 @@
 int option_verbose = 0;
 u_char etherbroadcastaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
-int main __P((int, char **));
-void usage __P((void));
-int getifhwaddr __P((char *, char *, struct ether_addr *));
-int setupfilter __P((char *, struct ether_addr *, int));
-void child_handler __P((int));
-int signal_init __P((void));
+int main(int, char **);
+void usage(void);
+int getifhwaddr(char *, char *, struct ether_addr *);
+int setupfilter(char *, struct ether_addr *, int);
+void child_handler(int);
+int signal_init(void);
 
 int
 main(int argc, char **argv) {
diff --git a/usr.sbin/pppoe/pppoe.h b/usr.sbin/pppoe/pppoe.h
index 7d5f5397eb6..238a9e236a8 100644
--- a/usr.sbin/pppoe/pppoe.h
+++ b/usr.sbin/pppoe/pppoe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pppoe.h,v 1.2 2001/04/24 05:02:34 jason Exp $	*/
+/*	$OpenBSD: pppoe.h,v 1.3 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -89,8 +89,8 @@ struct pppoe_tag {
 extern int option_verbose;
 extern u_char etherbroadcastaddr[];
 
-void server_mode __P((int, char *, char *, struct ether_addr *));
-int client_mode __P((int, char *, char *, struct ether_addr *));
+void server_mode(int, char *, char *, struct ether_addr *);
+int client_mode(int, char *, char *, struct ether_addr *);
 
 struct tag_list {
 	LIST_HEAD(, tag_node)		thelist;
@@ -104,14 +104,14 @@ struct tag_node {
 	int		_ref;
 };
 
-void tag_init __P((struct tag_list *));
-void tag_show __P((struct tag_list *));
-void tag_destroy __P((struct tag_list *));
-struct tag_node *tag_lookup __P((struct tag_list *, u_int16_t, int));
-int tag_add __P((struct tag_list *, u_int16_t, u_int16_t, u_int8_t *));
-int tag_pkt __P((struct tag_list *, u_long, u_int8_t *));
-void tag_hton __P((struct tag_list *));
-void tag_ntoh __P((struct tag_list *));
+void tag_init(struct tag_list *);
+void tag_show(struct tag_list *);
+void tag_destroy(struct tag_list *);
+struct tag_node *tag_lookup(struct tag_list *, u_int16_t, int);
+int tag_add(struct tag_list *, u_int16_t, u_int16_t, u_int8_t *);
+int tag_pkt(struct tag_list *, u_long, u_int8_t *);
+void tag_hton(struct tag_list *);
+void tag_ntoh(struct tag_list *);
 
 struct pppoe_session {
 	LIST_ENTRY(pppoe_session)	s_next;
@@ -128,19 +128,19 @@ struct pppoe_session_master {
 
 extern struct pppoe_session_master session_master;
 
-void session_init __P((void));
-void session_destroy __P((struct pppoe_session *));
-struct pppoe_session *session_new __P((struct ether_addr *));
-struct pppoe_session *session_find_eaid __P((struct ether_addr *, u_int16_t));
-struct pppoe_session *session_find_fd __P((int));
+void session_init(void);
+void session_destroy(struct pppoe_session *);
+struct pppoe_session *session_new(struct ether_addr *);
+struct pppoe_session *session_find_eaid(struct ether_addr *, u_int16_t);
+struct pppoe_session *session_find_fd(int);
 
-int runppp __P((int, char *));
-int bpf_to_ppp __P((int, u_long, u_int8_t *));
+int runppp(int, char *);
+int bpf_to_ppp(int, u_long, u_int8_t *);
 int ppp_to_bpf __P((int, int, struct ether_addr *, struct ether_addr *,
     u_int16_t));
-int send_padt __P((int, struct ether_addr *, struct ether_addr *, u_int16_t));
+int send_padt(int, struct ether_addr *, struct ether_addr *, u_int16_t);
 void recv_debug __P((int, struct ether_addr *,
     struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
-void debug_packet __P((u_int8_t *, int));
+void debug_packet(u_int8_t *, int);
 
-u_int32_t cookie_bake __P((void));
+u_int32_t cookie_bake(void);
diff --git a/usr.sbin/pppoe/server.c b/usr.sbin/pppoe/server.c
index 1c61b1e7274..d861f306af7 100644
--- a/usr.sbin/pppoe/server.c
+++ b/usr.sbin/pppoe/server.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.5 2001/11/29 16:49:09 miod Exp $	*/
+/*	$OpenBSD: server.c,v 1.6 2002/02/16 21:28:07 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -62,7 +62,7 @@
 
 static char ac_cookie_key[8];
 
-static void getpackets __P((int, char *, struct ether_addr *));
+static void getpackets(int, char *, struct ether_addr *);
 
 static void recv_padi __P((int, struct ether_addr *,
     struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
@@ -75,9 +75,9 @@ static void send_pado __P((int, struct ether_addr *,
     struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
 static void send_pads __P((int, char *, struct ether_addr *,
     struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
-static void key_gen __P((void));
-static u_int8_t *key_make __P((u_int8_t *, int, u_int8_t *, int));
-static int key_cmp __P((u_int8_t *, int, u_int8_t *, int, u_int8_t *, int));
+static void key_gen(void);
+static u_int8_t *key_make(u_int8_t *, int, u_int8_t *, int);
+static int key_cmp(u_int8_t *, int, u_int8_t *, int, u_int8_t *, int);
 
 void
 server_mode(bpffd, sysname, srvname, ea)
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index e215040bf82..d1f0305a5c4 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pstat.c,v 1.28 2002/01/19 00:03:29 millert Exp $	*/
+/*	$OpenBSD: pstat.c,v 1.29 2002/02/16 21:28:07 millert Exp $	*/
 /*	$NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 from: static char sccsid[] = "@(#)pstat.c	8.9 (Berkeley) 2/16/94";
 #else
-static char *rcsid = "$OpenBSD: pstat.c,v 1.28 2002/01/19 00:03:29 millert Exp $";
+static char *rcsid = "$OpenBSD: pstat.c,v 1.29 2002/02/16 21:28:07 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -121,28 +121,28 @@ kvm_t	*kd;
 		return (0);						\
 	}
 
-void	filemode __P((void));
-int	getfiles __P((char **, int *));
+void	filemode(void);
+int	getfiles(char **, int *);
 struct mount *
-	getmnt __P((struct mount *));
+	getmnt(struct mount *);
 struct e_vnode *
-	kinfo_vnodes __P((int *));
+	kinfo_vnodes(int *);
 struct e_vnode *
-	loadvnodes __P((int *));
-void	mount_print __P((struct mount *));
-void	nfs_header __P((void));
-int	nfs_print __P((struct vnode *));
-void	swapmode __P((void));
-void	ttymode __P((void));
-void	ttyprt __P((struct tty *));
-void	ufs_header __P((void));
-int	ufs_print __P((struct vnode *));
-void	ext2fs_header __P((void));
-int	ext2fs_print __P((struct vnode *));
-void	usage __P((void));
-void	vnode_header __P((void));
-void	vnode_print __P((struct vnode *, struct vnode *));
-void	vnodemode __P((void));
+	loadvnodes(int *);
+void	mount_print(struct mount *);
+void	nfs_header(void);
+int	nfs_print(struct vnode *);
+void	swapmode(void);
+void	ttymode(void);
+void	ttyprt(struct tty *);
+void	ufs_header(void);
+int	ufs_print(struct vnode *);
+void	ext2fs_header(void);
+int	ext2fs_print(struct vnode *);
+void	usage(void);
+void	vnode_header(void);
+void	vnode_print(struct vnode *, struct vnode *);
+void	vnodemode(void);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index e154334725f..1de1d15d0de 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pwd_mkdb.c,v 1.26 2001/09/17 14:30:39 mpech Exp $	*/
+/*	$OpenBSD: pwd_mkdb.c,v 1.27 2002/02/16 21:28:08 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -45,7 +45,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "from: @(#)pwd_mkdb.c	8.5 (Berkeley) 4/20/94";
 #else
-static char *rcsid = "$OpenBSD: pwd_mkdb.c,v 1.26 2001/09/17 14:30:39 mpech Exp $";
+static char *rcsid = "$OpenBSD: pwd_mkdb.c,v 1.27 2002/02/16 21:28:08 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -88,15 +88,15 @@ static char *basedir;				/* dir holding master.passwd */
 static int clean;				/* what to remove on cleanup */
 static int hasyp;				/* are we running YP? */
 
-void	cleanup __P((void));
-void	error __P((char *));
-void	errorx __P((char *));
-void	cp __P((char *, char *, mode_t));
-void	mv __P((char *, char *));
-int	scan __P((FILE *, struct passwd *, int *));
-void	usage __P((void));
-char	*changedir __P((char *path, char *dir));
-void	db_store __P((FILE *, FILE *, DB *, DB *,struct passwd *, int, char *, uid_t));
+void	cleanup(void);
+void	error(char *);
+void	errorx(char *);
+void	cp(char *, char *, mode_t);
+void	mv(char *, char *);
+int	scan(FILE *, struct passwd *, int *);
+void	usage(void);
+char	*changedir(char *path, char *dir);
+void	db_store(FILE *, FILE *, DB *, DB *,struct passwd *, int, char *, uid_t);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/rarpd/arptab.c b/usr.sbin/rarpd/arptab.c
index 29d7107ad8f..de88496e9b6 100644
--- a/usr.sbin/rarpd/arptab.c
+++ b/usr.sbin/rarpd/arptab.c
@@ -96,8 +96,8 @@ struct	{
 	char	m_space[512];
 }	m_rtmsg;
 
-int	arptab_set __P((u_char *, u_int32_t));
-int	rtmsg __P((int));
+int	arptab_set(u_char *, u_int32_t);
+int	rtmsg(int);
 
 /*
  * Set an individual arp entry
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index ca425c15aeb..e86594082c4 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rarpd.c,v 1.31 2001/12/01 23:27:23 miod Exp $ */
+/*	$OpenBSD: rarpd.c,v 1.32 2002/02/16 21:28:08 millert Exp $ */
 /*	$NetBSD: rarpd.c,v 1.25 1998/04/23 02:48:33 mrg Exp $	*/
 
 /*
@@ -28,7 +28,7 @@ char    copyright[] =
 #endif				/* not lint */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: rarpd.c,v 1.31 2001/12/01 23:27:23 miod Exp $";
+static char rcsid[] = "$OpenBSD: rarpd.c,v 1.32 2002/02/16 21:28:08 millert Exp $";
 #endif
 
 
@@ -89,22 +89,22 @@ struct if_info {
  */
 struct if_info *iflist;
 
-int    rarp_open     __P((char *));
-void   init_one      __P((char *));
-void   init_all      __P((void));
-void   rarp_loop     __P((void));
-void   lookup_addrs  __P((char *, struct if_info *));
-void   usage         __P((void));
-void   rarp_process  __P((struct if_info *, u_char *));
+int    rarp_open(char *);
+void   init_one(char *);
+void   init_all(void);
+void   rarp_loop(void);
+void   lookup_addrs(char *, struct if_info *);
+void   usage(void);
+void   rarp_process(struct if_info *, u_char *);
 void   rarp_reply    __P((struct if_info *, struct if_addr *,
 	struct ether_header *, u_int32_t, struct hostent *));
-void   update_arptab __P((u_char *, u_int32_t));
-void   err           __P((int, const char *,...));
-void   debug         __P((const char *,...));
-u_int32_t ipaddrtonetmask __P((u_int32_t));
+void   update_arptab(u_char *, u_int32_t);
+void   err(int, const char *,...);
+void   debug(const char *,...);
+u_int32_t ipaddrtonetmask(u_int32_t);
 
 #ifdef REQUIRE_TFTPBOOT
-int    rarp_bootable __P((u_int32_t));
+int    rarp_bootable(u_int32_t);
 #endif
 
 int     aflag = 0;		/* listen on "all" interfaces  */
@@ -835,7 +835,7 @@ lookup_addrs(ifname, p)
 #endif
 }
 
-int arptab_set __P((u_char *eaddr, u_int32_t host));
+int arptab_set(u_char *eaddr, u_int32_t host);
 
 /*
  * Poke the kernel arp tables with the ethernet/ip address combinataion
diff --git a/usr.sbin/rbootd/defs.h b/usr.sbin/rbootd/defs.h
index f02a81c9abb..7eba93dedd7 100644
--- a/usr.sbin/rbootd/defs.h
+++ b/usr.sbin/rbootd/defs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: defs.h,v 1.3 2001/12/01 23:27:23 miod Exp $	*/
+/*	$OpenBSD: defs.h,v 1.4 2002/02/16 21:28:08 millert Exp $	*/
 /*	$NetBSD: defs.h,v 1.5 1995/10/06 05:12:14 thorpej Exp $	*/
 
 /*
@@ -150,36 +150,36 @@ extern	RMPCONN	*RmpConns;		/* list of active connections */
 
 extern	u_int8_t RmpMcastAddr[];	/* RMP multicast address */
 
-void	 AddConn __P((RMPCONN *));
-int	 BootDone __P((RMPCONN *));
-void	 BpfClose __P((void));
-char	*BpfGetIntfName __P((char **));
-int	 BpfOpen __P((void));
-int	 BpfRead __P((RMPCONN *, int));
-int	 BpfWrite __P((RMPCONN *));
-void	 DebugOff __P((int));
-void	 DebugOn __P((int));
-void	 DispPkt __P((RMPCONN *, int));
-void	 DoTimeout __P((void));
-void	 DspFlnm __P((u_int, char *));
-void	 Exit __P((int));
-CLIENT	*FindClient __P((RMPCONN *));
-RMPCONN	*FindConn __P((RMPCONN *));
-void	 FreeClients __P((void));
-void	 FreeConn __P((RMPCONN *));
-void	 FreeConns __P((void));
-int	 GetBootFiles __P((void));
-char	*GetEtherAddr __P((u_int8_t *));
-CLIENT	*NewClient __P((u_int8_t *));
-RMPCONN	*NewConn __P((RMPCONN *));
-char	*NewStr __P((char *));
-u_int8_t *ParseAddr __P((char *));
-int	 ParseConfig __P((void));
-void	 ProcessPacket __P((RMPCONN *, CLIENT *));
-void	 ReConfig __P((int));
-void	 RemoveConn __P((RMPCONN *));
-int	 SendBootRepl __P((struct rmp_packet *, RMPCONN *, char *[]));
-int	 SendFileNo __P((struct rmp_packet *, RMPCONN *, char *[]));
-int	 SendPacket __P((RMPCONN *));
-int	 SendReadRepl __P((RMPCONN *));
-int	 SendServerID __P((RMPCONN *));
+void	 AddConn(RMPCONN *);
+int	 BootDone(RMPCONN *);
+void	 BpfClose(void);
+char	*BpfGetIntfName(char **);
+int	 BpfOpen(void);
+int	 BpfRead(RMPCONN *, int);
+int	 BpfWrite(RMPCONN *);
+void	 DebugOff(int);
+void	 DebugOn(int);
+void	 DispPkt(RMPCONN *, int);
+void	 DoTimeout(void);
+void	 DspFlnm(u_int, char *);
+void	 Exit(int);
+CLIENT	*FindClient(RMPCONN *);
+RMPCONN	*FindConn(RMPCONN *);
+void	 FreeClients(void);
+void	 FreeConn(RMPCONN *);
+void	 FreeConns(void);
+int	 GetBootFiles(void);
+char	*GetEtherAddr(u_int8_t *);
+CLIENT	*NewClient(u_int8_t *);
+RMPCONN	*NewConn(RMPCONN *);
+char	*NewStr(char *);
+u_int8_t *ParseAddr(char *);
+int	 ParseConfig(void);
+void	 ProcessPacket(RMPCONN *, CLIENT *);
+void	 ReConfig(int);
+void	 RemoveConn(RMPCONN *);
+int	 SendBootRepl(struct rmp_packet *, RMPCONN *, char *[]);
+int	 SendFileNo(struct rmp_packet *, RMPCONN *, char *[]);
+int	 SendPacket(RMPCONN *);
+int	 SendReadRepl(RMPCONN *);
+int	 SendServerID(RMPCONN *);
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index b662a753717..0b3c9a357b8 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -42,7 +42,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)repquota.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: repquota.c,v 1.14 2001/01/15 05:19:10 angelos Exp $";
+static char *rcsid = "$Id: repquota.c,v 1.15 2002/02/16 21:28:08 millert Exp $";
 #endif /* not lint */
 
 /*
@@ -78,10 +78,10 @@ uid_t highid[MAXQUOTAS];	/* highest addid()'ed identifier per type */
 int	vflag;			/* verbose */
 int	aflag;			/* all file systems */
 
-void	usage __P((void));
-int	repquota __P((struct fstab *, int, char *));
-int	hasquota __P((struct fstab *, int, char **));
-int	oneof __P((char *, char *[], int));
+void	usage(void);
+int	repquota(struct fstab *, int, char *);
+int	hasquota(struct fstab *, int, char **);
+int	oneof(char *, char *[], int);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c
index 01d10649558..c2bd954dfcd 100644
--- a/usr.sbin/rip6query/rip6query.c
+++ b/usr.sbin/rip6query/rip6query.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rip6query.c,v 1.5 2001/11/17 19:49:40 deraadt Exp $	*/
+/*	$OpenBSD: rip6query.c,v 1.6 2002/02/16 21:28:08 millert Exp $	*/
 /*	$KAME: rip6query.c,v 1.15 2001/11/16 07:01:21 itojun Exp $	*/
 
 /*
@@ -64,11 +64,11 @@ struct rip6	*ripbuf;
 
 #define	RIPSIZE(n)	(sizeof(struct rip6) + (n-1) * sizeof(struct netinfo6))
 
-int main __P((int, char **));
-static void usage __P((void));
-static void sigalrm_handler __P((int));
-static const char *sa_n2a __P((struct sockaddr *));
-static const char *inet6_n2a __P((struct in6_addr *));
+int main(int, char **);
+static void usage(void);
+static void sigalrm_handler(int);
+static const char *sa_n2a(struct sockaddr *);
+static const char *inet6_n2a(struct in6_addr *);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c
index ec706e35fa6..141eef14210 100644
--- a/usr.sbin/rmt/rmt.c
+++ b/usr.sbin/rmt/rmt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rmt.c,v 1.6 2000/07/20 01:41:13 jason Exp $	*/
+/*	$OpenBSD: rmt.c,v 1.7 2002/02/16 21:28:08 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)rmt.c	5.6 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: rmt.c,v 1.6 2000/07/20 01:41:13 jason Exp $";
+static char rcsid[] = "$Id: rmt.c,v 1.7 2002/02/16 21:28:08 millert Exp $";
 #endif /* not lint */
 
 /*
@@ -75,9 +75,9 @@ FILE	*debug;
 #define	DEBUG1(f,a)	if (debug) fprintf(debug, f, a)
 #define	DEBUG2(f,a1,a2)	if (debug) fprintf(debug, f, a1, a2)
 
-char	*checkbuf __P((char *, int));
-void	getstring __P((char *));
-void	error __P((int));
+char	*checkbuf(char *, int);
+void	getstring(char *);
+void	error(int);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index 48ed2e12590..c0243a429e9 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route6d.c,v 1.22 2002/01/11 03:51:08 itojun Exp $	*/
+/*	$OpenBSD: route6d.c,v 1.23 2002/02/16 21:28:08 millert Exp $	*/
 /*	$KAME: route6d.c,v 1.73 2001/09/05 01:12:34 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #if 0
-static char _rcsid[] = "$OpenBSD: route6d.c,v 1.22 2002/01/11 03:51:08 itojun Exp $";
+static char _rcsid[] = "$OpenBSD: route6d.c,v 1.23 2002/02/16 21:28:08 millert Exp $";
 #endif
 
 #include <stdio.h>
@@ -212,66 +212,66 @@ volatile sig_atomic_t seenusr1;
 #define RRTF_SENDANYWAY		0x40000000
 #define	RRTF_CHANGED		0x80000000
 
-int main __P((int, char **));
-void sighandler __P((int));
-void ripalarm __P((void));
-void riprecv __P((void));
-void ripsend __P((struct ifc *, struct sockaddr_in6 *, int));
-int out_filter __P((struct riprt *, struct ifc *));
-void init __P((void));
-void sockopt __P((struct ifc *));
-void ifconfig __P((void));
-void ifconfig1 __P((const char *, const struct sockaddr *, struct ifc *, int));
-void rtrecv __P((void));
+int main(int, char **);
+void sighandler(int);
+void ripalarm(void);
+void riprecv(void);
+void ripsend(struct ifc *, struct sockaddr_in6 *, int);
+int out_filter(struct riprt *, struct ifc *);
+void init(void);
+void sockopt(struct ifc *);
+void ifconfig(void);
+void ifconfig1(const char *, const struct sockaddr *, struct ifc *, int);
+void rtrecv(void);
 int rt_del __P((const struct sockaddr_in6 *, const struct sockaddr_in6 *,
 	const struct sockaddr_in6 *));
 int rt_deladdr __P((struct ifc *, const struct sockaddr_in6 *,
 	const struct sockaddr_in6 *));
-void filterconfig __P((void));
-int getifmtu __P((int));
-const char *rttypes __P((struct rt_msghdr *));
-const char *rtflags __P((struct rt_msghdr *));
-const char *ifflags __P((int));
-int ifrt __P((struct ifc *, int));
-void ifrt_p2p __P((struct ifc *, int));
-void applymask __P((struct in6_addr *, struct in6_addr *));
-void applyplen __P((struct in6_addr *, int));
-void ifrtdump __P((int));
-void ifdump __P((int));
-void ifdump0 __P((FILE *, const struct ifc *));
-void rtdump __P((int));
-void rt_entry __P((struct rt_msghdr *, int));
-void rtdexit __P((void));
+void filterconfig(void);
+int getifmtu(int);
+const char *rttypes(struct rt_msghdr *);
+const char *rtflags(struct rt_msghdr *);
+const char *ifflags(int);
+int ifrt(struct ifc *, int);
+void ifrt_p2p(struct ifc *, int);
+void applymask(struct in6_addr *, struct in6_addr *);
+void applyplen(struct in6_addr *, int);
+void ifrtdump(int);
+void ifdump(int);
+void ifdump0(FILE *, const struct ifc *);
+void rtdump(int);
+void rt_entry(struct rt_msghdr *, int);
+void rtdexit(void);
 void riprequest __P((struct ifc *, struct netinfo6 *, int,
 	struct sockaddr_in6 *));
-void ripflush __P((struct ifc *, struct sockaddr_in6 *));
-void sendrequest __P((struct ifc *));
-int sin6mask2len __P((const struct sockaddr_in6 *));
-int mask2len __P((const struct in6_addr *, int));
-int sendpacket __P((struct sockaddr_in6 *, int));
-int addroute __P((struct riprt *, const struct in6_addr *, struct ifc *));
-int delroute __P((struct netinfo6 *, struct in6_addr *));
-struct in6_addr *getroute __P((struct netinfo6 *, struct in6_addr *));
-void krtread __P((int));
-int tobeadv __P((struct riprt *, struct ifc *));
-char *allocopy __P((char *));
-char *hms __P((void));
-const char *inet6_n2p __P((const struct in6_addr *));
-struct ifac *ifa_match __P((const struct ifc *, const struct in6_addr *, int));
-struct in6_addr *plen2mask __P((int));
-struct riprt *rtsearch __P((struct netinfo6 *, struct riprt **));
-int ripinterval __P((int));
-time_t ripsuptrig __P((void));
-void fatal __P((const char *, ...))
+void ripflush(struct ifc *, struct sockaddr_in6 *);
+void sendrequest(struct ifc *);
+int sin6mask2len(const struct sockaddr_in6 *);
+int mask2len(const struct in6_addr *, int);
+int sendpacket(struct sockaddr_in6 *, int);
+int addroute(struct riprt *, const struct in6_addr *, struct ifc *);
+int delroute(struct netinfo6 *, struct in6_addr *);
+struct in6_addr *getroute(struct netinfo6 *, struct in6_addr *);
+void krtread(int);
+int tobeadv(struct riprt *, struct ifc *);
+char *allocopy(char *);
+char *hms(void);
+const char *inet6_n2p(const struct in6_addr *);
+struct ifac *ifa_match(const struct ifc *, const struct in6_addr *, int);
+struct in6_addr *plen2mask(int);
+struct riprt *rtsearch(struct netinfo6 *, struct riprt **);
+int ripinterval(int);
+time_t ripsuptrig(void);
+void fatal(const char *, ...)
 	__attribute__((__format__(__printf__, 1, 2)));
-void trace __P((int, const char *, ...))
+void trace(int, const char *, ...)
 	__attribute__((__format__(__printf__, 2, 3)));
-void tracet __P((int, const char *, ...))
+void tracet(int, const char *, ...)
 	__attribute__((__format__(__printf__, 2, 3)));
-unsigned int if_maxindex __P((void));
-struct ifc *ifc_find __P((char *));
-struct iff *iff_find __P((struct ifc *, int));
-void setindex2ifc __P((int, struct ifc *));
+unsigned int if_maxindex(void);
+struct ifc *ifc_find(char *);
+struct iff *iff_find(struct ifc *, int);
+void setindex2ifc(int, struct ifc *);
 
 #define	MALLOC(type)	((type *)malloc(sizeof(type)))
 
diff --git a/usr.sbin/rpc.bootparamd/bootparamd.c b/usr.sbin/rpc.bootparamd/bootparamd.c
index dee9ee9d1e4..9c5fce5d776 100644
--- a/usr.sbin/rpc.bootparamd/bootparamd.c
+++ b/usr.sbin/rpc.bootparamd/bootparamd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootparamd.c,v 1.10 2001/07/27 20:34:36 pvalchev Exp $	*/
+/*	$OpenBSD: bootparamd.c,v 1.11 2002/02/16 21:28:08 millert Exp $	*/
 
 /*
  * This code is not copyright, and is placed in the public domain.
@@ -31,7 +31,7 @@ static char askname[MAX_MACHINE_NAME];
 static char path[MAX_PATH_LEN];
 static char domain_name[MAX_MACHINE_NAME];
 
-extern void bootparamprog_1 __P((struct svc_req *, SVCXPRT *));
+extern void bootparamprog_1(struct svc_req *, SVCXPRT *);
 
 int	_rpcsvcdirty = 0;
 int	_rpcpmstart = 0;
diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index 51aac43f0b6..3be8f52be43 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lockd.c,v 1.4 1997/09/17 23:09:36 deraadt Exp $	*/
+/*	$OpenBSD: lockd.c,v 1.5 2002/02/16 21:28:08 millert Exp $	*/
 
 /*
  * Copyright (c) 1995
@@ -49,8 +49,8 @@
 
 #include "lockd.h"
 
-extern void nlm_prog_1 __P((struct svc_req, register SVCXPRT));
-extern void nlm_prog_3 __P((struct svc_req, register SVCXPRT));
+extern void nlm_prog_1(struct svc_req, register SVCXPRT);
+extern void nlm_prog_3(struct svc_req, register SVCXPRT);
 
 int     debug_level = 0;	/* Zero means no debugging syslog() calls	 */
 
diff --git a/usr.sbin/rpc.pcnfsd/paths.h b/usr.sbin/rpc.pcnfsd/paths.h
index 14336ad057b..cb9f4250054 100644
--- a/usr.sbin/rpc.pcnfsd/paths.h
+++ b/usr.sbin/rpc.pcnfsd/paths.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: paths.h,v 1.2 2001/08/19 19:16:12 ericj Exp $	*/
+/*	$OpenBSD: paths.h,v 1.3 2002/02/16 21:28:08 millert Exp $	*/
 /*	$NetBSD: paths.h,v 1.1 1995/08/14 19:50:09 gwr Exp $	*/
 
 #define SPOOLDIR        "/export/pcnfs"
@@ -9,17 +9,17 @@ pr_list printers;
 pr_queue queue;
 
 /* pcnfsd_misc.c */
-void scramble __P((char *, char *));
-void wlogin __P((char *, struct svc_req *));
-struct passwd *get_password __P((char *));
+void scramble(char *, char *);
+void wlogin(char *, struct svc_req *);
+struct passwd *get_password(char *);
 
 /* pcnfsd_print.c */
-void *grab __P((int));
-FILE *su_popen __P((char *, char *, int));
-int su_pclose __P((FILE *));
-int build_pr_list __P((void));
-pirstat build_pr_queue __P((printername, username, int, int *, int *));
-psrstat pr_start2 __P((char *, char *, char *, char *, char *, char **));
-pcrstat pr_cancel __P((char *, char *, char *));
+void *grab(int);
+FILE *su_popen(char *, char *, int);
+int su_pclose(FILE *);
+int build_pr_list(void);
+pirstat build_pr_queue(printername, username, int, int *, int *);
+psrstat pr_start2(char *, char *, char *, char *, char *, char **);
+pcrstat pr_cancel(char *, char *, char *);
 pirstat get_pr_status __P((printername, bool_t *, bool_t *, int *, bool_t *,
 			char *));
diff --git a/usr.sbin/rpc.pcnfsd/pcnfsd_v2.c b/usr.sbin/rpc.pcnfsd/pcnfsd_v2.c
index 8c08b87323c..6e03d4e99ae 100644
--- a/usr.sbin/rpc.pcnfsd/pcnfsd_v2.c
+++ b/usr.sbin/rpc.pcnfsd/pcnfsd_v2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcnfsd_v2.c,v 1.3 2001/08/19 19:16:12 ericj Exp $	*/
+/*	$OpenBSD: pcnfsd_v2.c,v 1.4 2002/02/16 21:28:08 millert Exp $	*/
 /*	$NetBSD: pcnfsd_v2.c,v 1.4 1995/08/14 19:50:10 gwr Exp $	*/
 
 /* RE_SID: @(%)/usr/dosnfs/shades_SCCS/unix/pcnfsd/v2/src/SCCS/s.pcnfsd_v2.c 1.2 91/12/18 13:26:13 SMI */
@@ -22,7 +22,7 @@
 #include "pcnfsd.h"
 #include "paths.h"
 
-static void fillin_extra_groups __P((char *, u_int, int *, u_int *));
+static void fillin_extra_groups(char *, u_int, int *, u_int *);
 
 static char no_comment[] = "No comment";
 static char not_supported[] = "Not supported";
diff --git a/usr.sbin/rtadvd/advcap.c b/usr.sbin/rtadvd/advcap.c
index 9e187fcc4b1..aac38b00b9c 100644
--- a/usr.sbin/rtadvd/advcap.c
+++ b/usr.sbin/rtadvd/advcap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advcap.c,v 1.4 2001/02/04 06:22:05 itojun Exp $	*/
+/*	$OpenBSD: advcap.c,v 1.5 2002/02/16 21:28:08 millert Exp $	*/
 /*	$KAME: advcap.c,v 1.5 2001/02/01 09:12:08 jinmei Exp $	*/
 
 /*
@@ -91,15 +91,15 @@ static	char *remotefile;
 
 extern char *conffile;
 
-int tgetent __P((char *, char *));
-int getent __P((char *, char *, char *));
-int tnchktc __P((void));
-int tnamatch __P((char *));
-static char *tskip __P((char *));
-long long tgetnum __P((char *));
-int tgetflag __P((char *));
-char *tgetstr __P((char *, char **));
-static char *tdecode __P((char *, char **));
+int tgetent(char *, char *);
+int getent(char *, char *, char *);
+int tnchktc(void);
+int tnamatch(char *);
+static char *tskip(char *);
+long long tgetnum(char *);
+int tgetflag(char *);
+char *tgetstr(char *, char **);
+static char *tdecode(char *, char **);
 
 /*
  * Get an entry for terminal name in buffer bp,
diff --git a/usr.sbin/rtadvd/advcap.h b/usr.sbin/rtadvd/advcap.h
index 34c3fa17d85..3c6ad980db4 100644
--- a/usr.sbin/rtadvd/advcap.h
+++ b/usr.sbin/rtadvd/advcap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advcap.h,v 1.4 2001/02/04 06:22:05 itojun Exp $	*/
+/*	$OpenBSD: advcap.h,v 1.5 2002/02/16 21:28:08 millert Exp $	*/
 /*	$KAME: advcap.h,v 1.3 2001/02/01 09:12:08 jinmei Exp $	*/
 
 /*
@@ -36,10 +36,10 @@
 
 __BEGIN_DECLS
 
-extern int agetent __P((char *, const char *));
-extern int agetflag __P((const char *));
-extern long long agetnum __P((const char *));
-extern char *agetstr __P((const char *, char **));
+extern int agetent(char *, const char *);
+extern int agetflag(const char *);
+extern long long agetnum(const char *);
+extern char *agetstr(const char *, char **);
 
 __END_DECLS
 
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c
index 31c637cbd4b..a369c16757b 100644
--- a/usr.sbin/rtadvd/config.c
+++ b/usr.sbin/rtadvd/config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.13 2001/06/03 09:27:31 itojun Exp $	*/
+/*	$OpenBSD: config.c,v 1.14 2002/02/16 21:28:08 millert Exp $	*/
 /*	$KAME: config.c,v 1.47 2001/06/02 18:50:46 jinmei Exp $	*/
 
 /*
@@ -71,9 +71,9 @@
 #include "if.h"
 #include "config.h"
 
-static void makeentry __P((char *, int, char *, int));
-static void get_prefix __P((struct rainfo *));
-static int getinet6sysctl __P((int));
+static void makeentry(char *, int, char *, int);
+static void get_prefix(struct rainfo *);
+static int getinet6sysctl(int);
 
 extern struct rainfo *ralist;
 
diff --git a/usr.sbin/rtadvd/config.h b/usr.sbin/rtadvd/config.h
index 33ce8638fcf..eb3efbe2b6a 100644
--- a/usr.sbin/rtadvd/config.h
+++ b/usr.sbin/rtadvd/config.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.h,v 1.4 2000/05/23 11:23:23 itojun Exp $	*/
+/*	$OpenBSD: config.h,v 1.5 2002/02/16 21:28:08 millert Exp $	*/
 /*	$KAME: config.h,v 1.3 2000/05/16 13:34:13 itojun Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-extern void getconfig __P((char *));
-extern void delete_prefix __P((struct rainfo *, struct prefix *));
-extern void make_prefix __P((struct rainfo *, int, struct in6_addr *, int));
-extern void make_packet __P((struct rainfo *));
+extern void getconfig(char *);
+extern void delete_prefix(struct rainfo *, struct prefix *);
+extern void make_prefix(struct rainfo *, int, struct in6_addr *, int);
+extern void make_packet(struct rainfo *);
diff --git a/usr.sbin/rtadvd/dump.c b/usr.sbin/rtadvd/dump.c
index 38698653b43..7735afed4ce 100644
--- a/usr.sbin/rtadvd/dump.c
+++ b/usr.sbin/rtadvd/dump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dump.c,v 1.3 2001/01/15 11:06:25 itojun Exp $	*/
+/*	$OpenBSD: dump.c,v 1.4 2002/02/16 21:28:08 millert Exp $	*/
 /*	$KAME: dump.c,v 1.15 2000/11/11 06:57:22 jinmei Exp $	*/
 
 /*
@@ -63,8 +63,8 @@ static FILE *fp;
 
 extern struct rainfo *ralist;
 
-static char *ether_str __P((struct sockaddr_dl *));
-static void if_dump __P((void));
+static char *ether_str(struct sockaddr_dl *);
+static void if_dump(void);
 
 #ifdef __FreeBSD__		/* XXX: see PORTABILITY */
 #define LONGLONG "%qu"
diff --git a/usr.sbin/rtadvd/dump.h b/usr.sbin/rtadvd/dump.h
index 698bcd63e49..41a31d93ed3 100644
--- a/usr.sbin/rtadvd/dump.h
+++ b/usr.sbin/rtadvd/dump.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dump.h,v 1.1 2000/05/23 11:33:48 itojun Exp $	*/
+/*	$OpenBSD: dump.h,v 1.2 2002/02/16 21:28:08 millert Exp $	*/
 /*	$KAME: dump.h,v 1.1 2000/05/23 11:31:26 itojun Exp $	*/
 
 /*
@@ -30,4 +30,4 @@
  * SUCH DAMAGE.
  */
 
-extern void rtadvd_dump_file __P((char *));
+extern void rtadvd_dump_file(char *);
diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c
index 03da5f24662..decc7ea844a 100644
--- a/usr.sbin/rtadvd/if.c
+++ b/usr.sbin/rtadvd/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.9 2001/01/21 15:42:35 itojun Exp $	*/
+/*	$OpenBSD: if.c,v 1.10 2002/02/16 21:28:08 millert Exp $	*/
 /*	$KAME: if.c,v 1.17 2001/01/21 15:27:30 itojun Exp $	*/
 
 /*
@@ -74,7 +74,7 @@ int iflist_init_ok;
 size_t ifblock_size;
 char *ifblock;
 
-static void get_iflist __P((char **buf, size_t *size));
+static void get_iflist(char **buf, size_t *size);
 static void parse_iflist __P((struct if_msghdr ***ifmlist_p, char *buf,
 		       size_t bufsize));
 
diff --git a/usr.sbin/rtadvd/if.h b/usr.sbin/rtadvd/if.h
index 67e79483912..b444d4b5e60 100644
--- a/usr.sbin/rtadvd/if.h
+++ b/usr.sbin/rtadvd/if.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.h,v 1.7 2001/01/21 15:42:36 itojun Exp $	*/
+/*	$OpenBSD: if.h,v 1.8 2002/02/16 21:28:08 millert Exp $	*/
 /*	$KAME: if.h,v 1.6 2001/01/21 15:37:14 itojun Exp $	*/
 
 /*
@@ -37,22 +37,22 @@ extern size_t ifblock_size;
 extern char *ifblock;
 
 struct nd_opt_hdr;
-struct sockaddr_dl *if_nametosdl __P((char *));
-int if_getmtu __P((char *));
-int if_getflags __P((int, int));
-int lladdropt_length __P((struct sockaddr_dl *));
-void lladdropt_fill __P((struct sockaddr_dl *, struct nd_opt_hdr *));
-int rtbuf_len __P((void));
-char *get_next_msg __P((char *, char *, int, size_t *, int));
-struct in6_addr *get_addr __P((char *));
-int get_rtm_ifindex __P((char *));
-int get_ifm_ifindex __P((char *));
-int get_ifam_ifindex __P((char *));
-int get_ifm_flags __P((char *));
-int get_prefixlen __P((char *));
-int prefixlen __P((u_char *, u_char *));
-int rtmsg_type __P((char *));
-int ifmsg_type __P((char *));
-int rtmsg_len __P((char *));
-int ifmsg_len __P((char *));
-void init_iflist __P((void));
+struct sockaddr_dl *if_nametosdl(char *);
+int if_getmtu(char *);
+int if_getflags(int, int);
+int lladdropt_length(struct sockaddr_dl *);
+void lladdropt_fill(struct sockaddr_dl *, struct nd_opt_hdr *);
+int rtbuf_len(void);
+char *get_next_msg(char *, char *, int, size_t *, int);
+struct in6_addr *get_addr(char *);
+int get_rtm_ifindex(char *);
+int get_ifm_ifindex(char *);
+int get_ifam_ifindex(char *);
+int get_ifm_flags(char *);
+int get_prefixlen(char *);
+int prefixlen(u_char *, u_char *);
+int rtmsg_type(char *);
+int ifmsg_type(char *);
+int rtmsg_len(char *);
+int ifmsg_len(char *);
+void init_iflist(void);
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c
index 83342fbcd61..b4f1ce09fa7 100644
--- a/usr.sbin/rtadvd/rtadvd.c
+++ b/usr.sbin/rtadvd/rtadvd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtadvd.c,v 1.13 2002/01/11 03:51:08 itojun Exp $	*/
+/*	$OpenBSD: rtadvd.c,v 1.14 2002/02/16 21:28:08 millert Exp $	*/
 /*	$KAME: rtadvd.c,v 1.50 2001/02/04 06:15:15 itojun Exp $	*/
 
 /*
@@ -125,12 +125,12 @@ u_int32_t ndopt_flags[] = {
 	NDOPT_FLAG_PREFIXINFO, NDOPT_FLAG_RDHDR, NDOPT_FLAG_MTU
 };
 
-int main __P((int, char *[]));
-static void set_die __P((int));
-static void die __P((void));
-static void sock_open __P((void));
-static void rtsock_open __P((void));
-static void rtadvd_input __P((void));
+int main(int, char *[]);
+static void set_die(int);
+static void die(void);
+static void sock_open(void);
+static void rtsock_open(void);
+static void rtadvd_input(void);
 static void rs_input __P((int, struct nd_router_solicit *,
 			  struct in6_pktinfo *, struct sockaddr_in6 *));
 static void ra_input __P((int, struct nd_router_advert *,
@@ -139,12 +139,12 @@ static int prefix_check __P((struct nd_opt_prefix_info *, struct rainfo *,
 			     struct sockaddr_in6 *));
 static int nd6_options __P((struct nd_opt_hdr *, int,
 			    union nd_opts *, u_int32_t));
-static void free_ndopts __P((union nd_opts *));
-static void ra_output __P((struct rainfo *));
-static void rtmsg_input __P((void));
-static void rtadvd_set_dump_file __P((void));
+static void free_ndopts(union nd_opts *);
+static void ra_output(struct rainfo *);
+static void rtmsg_input(void);
+static void rtadvd_set_dump_file(void);
 
-struct prefix *find_prefix __P((struct rainfo *, struct in6_addr *, int));
+struct prefix *find_prefix(struct rainfo *, struct in6_addr *, int);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h
index 456fd5257d7..6636573376c 100644
--- a/usr.sbin/rtadvd/rtadvd.h
+++ b/usr.sbin/rtadvd/rtadvd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtadvd.h,v 1.6 2001/01/15 11:06:30 itojun Exp $	*/
+/*	$OpenBSD: rtadvd.h,v 1.7 2002/02/16 21:28:08 millert Exp $	*/
 /*	$KAME: rtadvd.h,v 1.14 2000/11/11 06:57:22 jinmei Exp $	*/
 
 /*
@@ -146,11 +146,11 @@ struct	rainfo {
 	struct soliciter *soliciter;	/* recent solication source */
 };
 
-void ra_timeout __P((void *));
-void ra_timer_update __P((void *, struct timeval *));
+void ra_timeout(void *);
+void ra_timer_update(void *, struct timeval *);
 
-int prefix_match __P((struct in6_addr *, int, struct in6_addr *, int));
-struct rainfo *if_indextorainfo __P((int));
+int prefix_match(struct in6_addr *, int, struct in6_addr *, int);
+struct rainfo *if_indextorainfo(int);
 
 extern struct in6_addr in6a_site_allrouters;
 #ifdef MIP6
diff --git a/usr.sbin/rtadvd/timer.c b/usr.sbin/rtadvd/timer.c
index 2edcdf01a90..88f2417ace2 100644
--- a/usr.sbin/rtadvd/timer.c
+++ b/usr.sbin/rtadvd/timer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timer.c,v 1.4 2000/07/06 10:14:49 itojun Exp $	*/
+/*	$OpenBSD: timer.c,v 1.5 2002/02/16 21:28:08 millert Exp $	*/
 /*	$KAME: timer.c,v 1.4 2000/05/27 11:30:43 jinmei Exp $	*/
 
 /*
@@ -59,8 +59,8 @@ rtadvd_timer_init()
 }
 
 struct rtadvd_timer *
-rtadvd_add_timer(void (*timeout) __P((void *)),
-		void (*update) __P((void *, struct timeval *)),
+rtadvd_add_timer(void (*timeout)(void *),
+		void (*update)(void *, struct timeval *),
 		 void *timeodata, void *updatedata)
 {
 	struct rtadvd_timer *newtimer;
diff --git a/usr.sbin/rtadvd/timer.h b/usr.sbin/rtadvd/timer.h
index 617f28a284d..f667e8c268b 100644
--- a/usr.sbin/rtadvd/timer.h
+++ b/usr.sbin/rtadvd/timer.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timer.h,v 1.4 2000/07/06 10:14:49 itojun Exp $	*/
+/*	$OpenBSD: timer.h,v 1.5 2002/02/16 21:28:09 millert Exp $	*/
 /*	$KAME: timer.h,v 1.3 2000/05/27 11:30:43 jinmei Exp $	*/
 
 /*
@@ -46,19 +46,19 @@ struct rtadvd_timer {
 	struct rainfo *rai;
 	struct timeval tm;
 
-	void (*expire) __P((void *));	/* expiration function */
+	void (*expire)(void *);		/* expiration function */
 	void *expire_data;
-	void (*update) __P((void *, struct timeval *));	/* update function */
+	void (*update)(void *, struct timeval *);	/* update function */
 	void *update_data;
 };
 
-void rtadvd_timer_init __P((void));
-struct rtadvd_timer *rtadvd_add_timer __P((void (*) __P((void *)),
-		void (*) __P((void *, struct timeval *)), void *, void *));
-void rtadvd_set_timer __P((struct timeval *, struct rtadvd_timer *));
-void rtadvd_remove_timer __P((struct rtadvd_timer **));
-struct timeval * rtadvd_check_timer __P((void));
-struct timeval * rtadvd_timer_rest __P((struct rtadvd_timer *));
+void rtadvd_timer_init(void);
+struct rtadvd_timer *rtadvd_add_timer __P((void (*)(void *),
+		void (*)(void *, struct timeval *), void *, void *));
+void rtadvd_set_timer(struct timeval *, struct rtadvd_timer *);
+void rtadvd_remove_timer(struct rtadvd_timer **);
+struct timeval * rtadvd_check_timer(void);
+struct timeval * rtadvd_timer_rest(struct rtadvd_timer *);
 void TIMEVAL_ADD __P((struct timeval *, struct timeval *,
 		      struct timeval *)); 
 void TIMEVAL_SUB __P((struct timeval *, struct timeval *,
diff --git a/usr.sbin/rtsold/dump.c b/usr.sbin/rtsold/dump.c
index 3769d11e1f0..57d614e8219 100644
--- a/usr.sbin/rtsold/dump.c
+++ b/usr.sbin/rtsold/dump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dump.c,v 1.6 2001/08/22 05:34:54 itojun Exp $	*/
+/*	$OpenBSD: dump.c,v 1.7 2002/02/16 21:28:09 millert Exp $	*/
 /*	$KAME: dump.c,v 1.9 2001/08/20 06:55:54 itojun Exp $	*/
 
 /*
@@ -50,8 +50,8 @@ static FILE *fp;
 
 extern struct ifinfo *iflist;
 
-static void dump_interface_status __P((void));
-static char *sec2str __P((time_t));
+static void dump_interface_status(void);
+static char *sec2str(time_t);
 char *ifstatstr[] = {"IDLE", "DELAY", "PROBE", "DOWN", "TENTATIVE"};
 
 static void
diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c
index 106c2247b57..9b52e09c1ed 100644
--- a/usr.sbin/rtsold/if.c
+++ b/usr.sbin/rtsold/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.8 2001/11/14 01:59:36 itojun Exp $	*/
+/*	$OpenBSD: if.c,v 1.9 2002/02/16 21:28:09 millert Exp $	*/
 /*	$KAME: if.c,v 1.15 2001/05/22 06:04:17 jinmei Exp $	*/
 
 /*
@@ -76,9 +76,9 @@
 extern int rssock;
 static int ifsock;
 
-static int get_llflag __P((const char *name));
+static int get_llflag(const char *name);
 #ifndef HAVE_GETIFADDRS
-static unsigned int if_maxindex __P((void));
+static unsigned int if_maxindex(void);
 #endif
 static void get_rtaddrs __P((int addrs, struct sockaddr *sa,
 			     struct sockaddr **rti_info));
diff --git a/usr.sbin/rtsold/probe.c b/usr.sbin/rtsold/probe.c
index 349b40b896b..ea1e175d8cc 100644
--- a/usr.sbin/rtsold/probe.c
+++ b/usr.sbin/rtsold/probe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: probe.c,v 1.3 2000/08/13 18:24:00 itojun Exp $	*/
+/*	$OpenBSD: probe.c,v 1.4 2002/02/16 21:28:09 millert Exp $	*/
 /*	$KAME: probe.c,v 1.10 2000/08/13 06:14:59 itojun Exp $	*/
 
 /*
@@ -60,7 +60,7 @@
 static struct msghdr sndmhdr;
 static struct iovec sndiov[2];
 static int probesock;
-static void sendprobe __P((struct in6_addr *addr, int ifindex));
+static void sendprobe(struct in6_addr *addr, int ifindex);
 
 
 int
diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c
index e17fc79cea2..bfa8a7bd2f9 100644
--- a/usr.sbin/rtsold/rtsold.c
+++ b/usr.sbin/rtsold/rtsold.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsold.c,v 1.14 2002/01/11 03:51:08 itojun Exp $	*/
+/*	$OpenBSD: rtsold.c,v 1.15 2002/02/16 21:28:09 millert Exp $	*/
 /*	$KAME: rtsold.c,v 1.32 2001/07/09 22:34:07 itojun Exp $	*/
 
 /*
@@ -83,27 +83,27 @@ static int fflag = 0;
 /* a == b */
 #define TIMEVAL_EQ(a, b) (((a).tv_sec==(b).tv_sec) && ((a).tv_usec==(b).tv_usec))
 
-int main __P((int argc, char *argv[]));
+int main(int argc, char *argv[]);
 
 /* static variables and functions */
 static int mobile_node = 0;
 volatile sig_atomic_t do_dump;
 static char *dumpfilename = "/var/run/rtsold.dump"; /* XXX: should be configurable */
 
-static int ifconfig __P((char *ifname));
+static int ifconfig(char *ifname);
 #if 0
-static int ifreconfig __P((char *ifname));
+static int ifreconfig(char *ifname);
 #endif
-static int make_packet __P((struct ifinfo *ifinfo));
-static struct timeval *rtsol_check_timer __P((void));
+static int make_packet(struct ifinfo *ifinfo);
+static struct timeval *rtsol_check_timer(void);
 static void TIMEVAL_ADD __P((struct timeval *a, struct timeval *b,
 			     struct timeval *result));
 static void TIMEVAL_SUB __P((struct timeval *a, struct timeval *b,
 			     struct timeval *result));
 
-static void rtsold_set_dump_file __P((void));
-static void usage __P((char *progname));
-static char **autoifprobe __P((void));
+static void rtsold_set_dump_file(void);
+static void usage(char *progname);
+static char **autoifprobe(void);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/rtsold/rtsold.h b/usr.sbin/rtsold/rtsold.h
index 9459bc992cb..6c4a719c564 100644
--- a/usr.sbin/rtsold/rtsold.h
+++ b/usr.sbin/rtsold/rtsold.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsold.h,v 1.6 2001/07/09 22:37:33 itojun Exp $	*/
+/*	$OpenBSD: rtsold.h,v 1.7 2002/02/16 21:28:09 millert Exp $	*/
 /*	$KAME: rtsold.h,v 1.11 2000/10/10 06:18:04 itojun Exp $	*/
 
 /*
@@ -62,35 +62,35 @@ struct ifinfo {
 /* rtsold.c */
 extern struct timeval tm_max;
 extern int dflag;
-struct ifinfo *find_ifinfo __P((int ifindex));
-void rtsol_timer_update __P((struct ifinfo *ifinfo));
-extern void warnmsg __P((int, const char *, const char *, ...))
+struct ifinfo *find_ifinfo(int ifindex);
+void rtsol_timer_update(struct ifinfo *ifinfo);
+extern void warnmsg(int, const char *, const char *, ...)
      __attribute__((__format__(__printf__, 3, 4)));
 
 /* if.c */
-extern int ifinit __P((void));
-extern int interface_up __P((char *name));
-extern int interface_status __P((struct ifinfo*));
-extern int lladdropt_length __P((struct sockaddr_dl *sdl));
+extern int ifinit(void);
+extern int interface_up(char *name);
+extern int interface_status(struct ifinfo*);
+extern int lladdropt_length(struct sockaddr_dl *sdl);
 extern void lladdropt_fill __P((struct sockaddr_dl *sdl,
 				struct nd_opt_hdr *ndopt));
-extern struct sockaddr_dl *if_nametosdl __P((char *name));
-extern int getinet6sysctl __P((int code));
+extern struct sockaddr_dl *if_nametosdl(char *name);
+extern int getinet6sysctl(int code);
 
 /* rtsol.c */
-extern int sockopen __P((void));
-extern void sendpacket __P((struct ifinfo *ifinfo));
-extern void rtsol_input __P((int s));
+extern int sockopen(void);
+extern void sendpacket(struct ifinfo *ifinfo);
+extern void rtsol_input(int s);
 
 /* probe.c */
-extern int probe_init __P((void));
-extern void defrouter_probe __P((int ifindex));
+extern int probe_init(void);
+extern void defrouter_probe(int ifindex);
 
 /* dump.c */
-extern void rtsold_dump_file __P((char *));
+extern void rtsold_dump_file(char *);
 
 #if 0
 /* rtsock.c */
-extern int rtsock_open __P((void));
-extern int rtsock_input __P((int));
+extern int rtsock_open(void);
+extern int rtsock_input(int);
 #endif
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index e3328b84de5..2511e26d902 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -39,7 +39,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "@(#)rwhod.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: rwhod.c,v 1.19 2001/11/17 19:49:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rwhod.c,v 1.20 2002/02/16 21:28:09 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -101,17 +101,17 @@ volatile sig_atomic_t gothup;
 
 #define	WHDRSIZE	(sizeof(mywd) - sizeof(mywd.wd_we))
 
-int	 configure __P((int));
-void	 getboottime __P((void));
-void	 hup __P((int));
-void	 timer __P((void));
-void	 quit __P((char *));
-void	 rt_xaddrs __P((caddr_t, caddr_t, struct rt_addrinfo *));
-int	 verify __P((char *));
-void	 handleread __P((int s));
+int	 configure(int);
+void	 getboottime(void);
+void	 hup(int);
+void	 timer(void);
+void	 quit(char *);
+void	 rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *);
+int	 verify(char *);
+void	 handleread(int s);
 int	 Sendto __P((int, const void *, size_t, int,
 	    const struct sockaddr *, socklen_t));
-char	*interval __P((int, char *));
+char	*interval(int, char *);
 
 void
 hup(signo)
diff --git a/usr.sbin/sa/extern.h b/usr.sbin/sa/extern.h
index 144b00db847..5d6584a1d69 100644
--- a/usr.sbin/sa/extern.h
+++ b/usr.sbin/sa/extern.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: extern.h,v 1.2 1999/08/06 20:41:08 deraadt Exp $
+ *	$Id: extern.h,v 1.3 2002/02/16 21:28:09 millert Exp $
  */
 
 #include <sys/types.h>
@@ -60,24 +60,24 @@ struct userinfo {
 
 /* typedefs */
 
-typedef	int (*cmpf_t) __P((const DBT *, const DBT *));
+typedef	int (*cmpf_t)(const DBT *, const DBT *);
 
 /* external functions in sa.c */
-int	main		__P((int, char **));
+int	main(int, char **);
 
 /* external functions in pdb.c */
-int	pacct_init	__P((void));
-void	pacct_destroy	__P((void));
-int	pacct_add	__P((const struct cmdinfo *));
-int	pacct_update	__P((void));
-void	pacct_print	__P((void));
+int	pacct_init(void);
+void	pacct_destroy(void);
+int	pacct_add(const struct cmdinfo *);
+int	pacct_update(void);
+void	pacct_print(void);
 
 /* external functions in usrdb.c */
-int	usracct_init	__P((void));
-void	usracct_destroy	__P((void));
-int	usracct_add	__P((const struct cmdinfo *));
-int	usracct_update	__P((void));
-void	usracct_print	__P((void));
+int	usracct_init(void);
+void	usracct_destroy(void);
+int	usracct_add(const struct cmdinfo *);
+int	usracct_update(void);
+void	usracct_print(void);
 
 /* variables */
 
diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c
index fbbc6610adc..2d9a0bd887d 100644
--- a/usr.sbin/sa/main.c
+++ b/usr.sbin/sa/main.c
@@ -33,7 +33,7 @@ static char copright[] =
 "@(#) Copyright (c) 1994 Christopher G. Demetriou\n\
  All rights reserved.\n";
 
-static char rcsid[] = "$Id: main.c,v 1.6 2001/07/27 20:34:36 pvalchev Exp $";
+static char rcsid[] = "$Id: main.c,v 1.7 2002/02/16 21:28:09 millert Exp $";
 #endif
 
 /*
@@ -53,16 +53,16 @@ static char rcsid[] = "$Id: main.c,v 1.6 2001/07/27 20:34:36 pvalchev Exp $";
 #include "extern.h"
 #include "pathnames.h"
 
-static int	acct_load	__P((char *, int));
-static u_quad_t	decode_comp_t	__P((comp_t));
-static int	cmp_comm	__P((const char *, const char *));
-static int	cmp_usrsys	__P((const DBT *, const DBT *));
-static int	cmp_avgusrsys	__P((const DBT *, const DBT *));
-static int	cmp_dkio	__P((const DBT *, const DBT *));
-static int	cmp_avgdkio	__P((const DBT *, const DBT *));
-static int	cmp_cpumem	__P((const DBT *, const DBT *));
-static int	cmp_avgcpumem	__P((const DBT *, const DBT *));
-static int	cmp_calls	__P((const DBT *, const DBT *));
+static int	acct_load(char *, int);
+static u_quad_t	decode_comp_t(comp_t);
+static int	cmp_comm(const char *, const char *);
+static int	cmp_usrsys(const DBT *, const DBT *);
+static int	cmp_avgusrsys(const DBT *, const DBT *);
+static int	cmp_dkio(const DBT *, const DBT *);
+static int	cmp_avgdkio(const DBT *, const DBT *);
+static int	cmp_cpumem(const DBT *, const DBT *);
+static int	cmp_avgcpumem(const DBT *, const DBT *);
+static int	cmp_calls(const DBT *, const DBT *);
 
 int aflag, bflag, cflag, dflag, Dflag, fflag, iflag, jflag, kflag;
 int Kflag, lflag, mflag, qflag, rflag, sflag, tflag, uflag, vflag;
diff --git a/usr.sbin/sa/pdb.c b/usr.sbin/sa/pdb.c
index 9472ef6024b..4157e764f88 100644
--- a/usr.sbin/sa/pdb.c
+++ b/usr.sbin/sa/pdb.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: pdb.c,v 1.2 1998/12/18 20:47:34 deraadt Exp $";
+static char rcsid[] = "$Id: pdb.c,v 1.3 2002/02/16 21:28:09 millert Exp $";
 #endif
 
 #include <sys/types.h>
@@ -42,9 +42,9 @@ static char rcsid[] = "$Id: pdb.c,v 1.2 1998/12/18 20:47:34 deraadt Exp $";
 #include "extern.h"
 #include "pathnames.h"
 
-static int check_junk __P((struct cmdinfo *));
-static void add_ci __P((const struct cmdinfo *, struct cmdinfo *));
-static void print_ci __P((const struct cmdinfo *, const struct cmdinfo *));
+static int check_junk(struct cmdinfo *);
+static void add_ci(const struct cmdinfo *, struct cmdinfo *);
+static void print_ci(const struct cmdinfo *, const struct cmdinfo *);
 
 static DB	*pacct_db;
 
diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c
index ee92dfbca55..a2e5757b02b 100644
--- a/usr.sbin/sa/usrdb.c
+++ b/usr.sbin/sa/usrdb.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: usrdb.c,v 1.3 2001/07/27 20:34:36 pvalchev Exp $";
+static char rcsid[] = "$Id: usrdb.c,v 1.4 2002/02/16 21:28:09 millert Exp $";
 #endif
 
 #include <sys/types.h>
@@ -41,7 +41,7 @@ static char rcsid[] = "$Id: usrdb.c,v 1.3 2001/07/27 20:34:36 pvalchev Exp $";
 #include "extern.h"
 #include "pathnames.h"
 
-static int uid_compare __P((const DBT *, const DBT *));
+static int uid_compare(const DBT *, const DBT *);
 
 static DB	*usracct_db;
 
diff --git a/usr.sbin/screenblank/screenblank.c b/usr.sbin/screenblank/screenblank.c
index a62c236ddd5..9685c3d4b7d 100644
--- a/usr.sbin/screenblank/screenblank.c
+++ b/usr.sbin/screenblank/screenblank.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: screenblank.c,v 1.11 2001/12/09 14:58:21 miod Exp $	*/
+/*	$OpenBSD: screenblank.c,v 1.12 2002/02/16 21:28:09 millert Exp $	*/
 /*	$NetBSD: screenblank.c,v 1.2 1996/02/28 01:18:34 thorpej Exp $	*/
 
 /*-
@@ -75,13 +75,13 @@ LIST_HEAD(ds_list, dev_stat) ds_list;
 
 extern	char *__progname;
 
-void add_dev __P((char *, int));
-void change_state __P((int, int));
-void cvt_arg __P((char *, struct timeval *));
-void logpid __P((void));
-void sighandler __P((int));
-void usage __P((void));
-void cleanup __P((int));
+void add_dev(char *, int);
+void change_state(int, int);
+void cvt_arg(char *, struct timeval *);
+void logpid(void);
+void sighandler(int);
+void usage(void);
+void cleanup(int);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/sesd/srcs/chpmon.c b/usr.sbin/sesd/srcs/chpmon.c
index fff8331d970..2fd11fceac0 100644
--- a/usr.sbin/sesd/srcs/chpmon.c
+++ b/usr.sbin/sesd/srcs/chpmon.c
@@ -48,7 +48,7 @@
 #define	BADSTAT	\
 	(SES_ENCSTAT_UNRECOV|SES_ENCSTAT_CRITICAL|SES_ENCSTAT_NONCRITICAL)
 
-int main __P((int, char **));
+int main(int, char **);
 
 int
 main(a, v)
diff --git a/usr.sbin/sesd/srcs/eltsub.c b/usr.sbin/sesd/srcs/eltsub.c
index 63150361069..ed32a4cc0a0 100644
--- a/usr.sbin/sesd/srcs/eltsub.c
+++ b/usr.sbin/sesd/srcs/eltsub.c
@@ -1,6 +1,6 @@
 /* $NetBSD: $ */
 /* $FreeBSD: $ */
-/* $OpenBSD: eltsub.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */
+/* $OpenBSD: eltsub.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -40,9 +40,9 @@
 #include <sys/ioctl.h>
 #include SESINC
 
-char *geteltnm __P((int));
-static char *scode2ascii __P((u_char));
-char *stat2ascii __P((int, u_char *));
+char *geteltnm(int);
+static char *scode2ascii(u_char);
+char *stat2ascii(int, u_char *);
 
 char *
 geteltnm(type)
diff --git a/usr.sbin/sesd/srcs/getencstat.c b/usr.sbin/sesd/srcs/getencstat.c
index 3dbbbfb5aa9..e53c07a33b3 100644
--- a/usr.sbin/sesd/srcs/getencstat.c
+++ b/usr.sbin/sesd/srcs/getencstat.c
@@ -1,6 +1,6 @@
 /* $NetBSD: $ */ 
 /* $FreeBSD: $ */
-/* $OpenBSD: getencstat.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */
+/* $OpenBSD: getencstat.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -41,9 +41,9 @@
 #include <fcntl.h>
 #include SESINC
 
-extern char *geteltnm __P((int));
-extern char *stat2ascii __P((int, u_char *));
-int main __P((int, char **));
+extern char *geteltnm(int);
+extern char *stat2ascii(int, u_char *);
+int main(int, char **);
 
 int
 main(a, v)
diff --git a/usr.sbin/sesd/srcs/getnobj.c b/usr.sbin/sesd/srcs/getnobj.c
index e9bc0d3b402..8c040c1e269 100644
--- a/usr.sbin/sesd/srcs/getnobj.c
+++ b/usr.sbin/sesd/srcs/getnobj.c
@@ -1,6 +1,6 @@
 /* $NetBSD: $ */ 
 /* $FreeBSD: $ */
-/* $OpenBSD: getnobj.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */
+/* $OpenBSD: getnobj.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -42,7 +42,7 @@
 #include <sys/ioctl.h>
 #include SESINC
 
-int main __P((int, char **));
+int main(int, char **);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/sesd/srcs/getobjmap.c b/usr.sbin/sesd/srcs/getobjmap.c
index 3bc0c863ba5..ebe1686e4c4 100644
--- a/usr.sbin/sesd/srcs/getobjmap.c
+++ b/usr.sbin/sesd/srcs/getobjmap.c
@@ -1,6 +1,6 @@
 /* $NetBSD: $ */ 
 /* $FreeBSD: $ */
-/* $OpenBSD: getobjmap.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */
+/* $OpenBSD: getobjmap.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -41,8 +41,8 @@
 #include <sys/ioctl.h>
 #include SESINC
 
-int main __P((int, char **));
-extern char *geteltnm __P((int));
+int main(int, char **);
+extern char *geteltnm(int);
 
 int
 main(a, v)
diff --git a/usr.sbin/sesd/srcs/getobjstat.c b/usr.sbin/sesd/srcs/getobjstat.c
index 57b81bce140..b55e1f5ff92 100644
--- a/usr.sbin/sesd/srcs/getobjstat.c
+++ b/usr.sbin/sesd/srcs/getobjstat.c
@@ -1,6 +1,6 @@
 /* $NetBSD: $ */ 
 /* $FreeBSD: $ */
-/* $OpenBSD: getobjstat.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */
+/* $OpenBSD: getobjstat.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -40,7 +40,7 @@
 #include <sys/ioctl.h>
 #include SESINC
 
-int main __P((int, char **));
+int main(int, char **);
 
 int
 main(a, v)
diff --git a/usr.sbin/sesd/srcs/inienc.c b/usr.sbin/sesd/srcs/inienc.c
index 519201284d8..61be17e1bda 100644
--- a/usr.sbin/sesd/srcs/inienc.c
+++ b/usr.sbin/sesd/srcs/inienc.c
@@ -1,6 +1,6 @@
 /* $NetBSD: $ */ 
 /* $FreeBSD: $ */
-/* $OpenBSD: inienc.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */
+/* $OpenBSD: inienc.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -41,7 +41,7 @@
 #include <sys/ioctl.h>
 #include SESINC
 
-int __P((int, char **));
+int(int, char **);
 
 int
 main(a, v)
diff --git a/usr.sbin/sesd/srcs/sesd.c b/usr.sbin/sesd/srcs/sesd.c
index 237746bb7c0..93e415bcb23 100644
--- a/usr.sbin/sesd/srcs/sesd.c
+++ b/usr.sbin/sesd/srcs/sesd.c
@@ -1,6 +1,6 @@
 /* $NetBSD: $ */
 /* $FreeBSD: $ */
-/* $OpenBSD: sesd.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */
+/* $OpenBSD: sesd.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -45,7 +45,7 @@
 
 #define	ALLSTAT (SES_ENCSTAT_UNRECOV | SES_ENCSTAT_CRITICAL | \
 	SES_ENCSTAT_NONCRITICAL | SES_ENCSTAT_INFO)
-int main __P((int, char **));
+int main(int, char **);
 
 /*
  * Monitor named SES devices and note (via syslog) any changes in status.
diff --git a/usr.sbin/sesd/srcs/setencstat.c b/usr.sbin/sesd/srcs/setencstat.c
index fc85b8fded6..358b3580b98 100644
--- a/usr.sbin/sesd/srcs/setencstat.c
+++ b/usr.sbin/sesd/srcs/setencstat.c
@@ -1,6 +1,6 @@
 /* $NetBSD: $ */ 
 /* $FreeBSD: $ */
-/* $OpenBSD: setencstat.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */
+/* $OpenBSD: setencstat.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -41,7 +41,7 @@
 #include <sys/ioctl.h>
 #include SESINC
 
-int main __P((int, char **));
+int main(int, char **);
 
 int
 main(a, v)
diff --git a/usr.sbin/sesd/srcs/setobjstat.c b/usr.sbin/sesd/srcs/setobjstat.c
index f094dff61c7..5cdd252f4e7 100644
--- a/usr.sbin/sesd/srcs/setobjstat.c
+++ b/usr.sbin/sesd/srcs/setobjstat.c
@@ -1,6 +1,6 @@
 /* $NetBSD: $ */ 
 /* $FreeBSD: $ */
-/* $OpenBSD: setobjstat.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */
+/* $OpenBSD: setobjstat.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -41,7 +41,7 @@
 #include <sys/ioctl.h>
 #include SESINC
 
-int main __P((int, char **));
+int main(int, char **);
 
 int
 main(a, v)
diff --git a/usr.sbin/slstats/slstats.c b/usr.sbin/slstats/slstats.c
index 4390bc776c0..a3dfe98f67b 100644
--- a/usr.sbin/slstats/slstats.c
+++ b/usr.sbin/slstats/slstats.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: slstats.c,v 1.13 2001/11/17 19:49:41 deraadt Exp $	*/
+/*	$OpenBSD: slstats.c,v 1.14 2002/02/16 21:28:09 millert Exp $	*/
 /*	$NetBSD: slstats.c,v 1.6.6.1 1996/06/07 01:42:30 thorpej Exp $	*/
 
 /*
@@ -25,7 +25,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: slstats.c,v 1.13 2001/11/17 19:49:41 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: slstats.c,v 1.14 2002/02/16 21:28:09 millert Exp $";
 #endif
 
 #define INET
@@ -67,9 +67,9 @@ int	unit;
 int	s;
 char    interface[IFNAMSIZ];
 
-void	catchalarm __P((void));
-void	intpr __P((void));
-void	usage __P((void));
+void	catchalarm(void);
+void	intpr(void);
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 3c80c22cc46..1e83cd0b859 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syslogd.c,v 1.48 2001/12/02 02:23:45 deraadt Exp $	*/
+/*	$OpenBSD: syslogd.c,v 1.49 2002/02/16 21:28:09 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993, 1994
@@ -43,7 +43,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)syslogd.c	8.3 (Berkeley) 4/4/94";
 #else
-static char rcsid[] = "$OpenBSD: syslogd.c,v 1.48 2001/12/02 02:23:45 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: syslogd.c,v 1.49 2002/02/16 21:28:09 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -200,25 +200,25 @@ volatile sig_atomic_t DoInit;
 
 int	SecureMode = 1;		/* when true, speak only unix domain socks */
 
-void	cfline __P((char *, struct filed *, char *));
-char   *cvthname __P((struct sockaddr_in *));
-int	decode __P((const char *, CODE *));
-void	dodie __P((int));
-void	doinit __P((int));
-void	die __P((int));
-void	domark __P((int));
-void	markit __P((void));
-void	fprintlog __P((struct filed *, int, char *));
-void	init __P((void));
-void	logerror __P((char *));
-void	logmsg __P((int, char *, char *, int));
-void	printline __P((char *, char *));
-void	printsys __P((char *));
-void	reapchild __P((int));
-char   *ttymsg __P((struct iovec *, int, char *, int));
-void	usage __P((void));
-void	wallmsg __P((struct filed *, struct iovec *));
-int	getmsgbufsize __P((void));
+void	cfline(char *, struct filed *, char *);
+char   *cvthname(struct sockaddr_in *);
+int	decode(const char *, CODE *);
+void	dodie(int);
+void	doinit(int);
+void	die(int);
+void	domark(int);
+void	markit(void);
+void	fprintlog(struct filed *, int, char *);
+void	init(void);
+void	logerror(char *);
+void	logmsg(int, char *, char *, int);
+void	printline(char *, char *);
+void	printsys(char *);
+void	reapchild(int);
+char   *ttymsg(struct iovec *, int, char *, int);
+void	usage(void);
+void	wallmsg(struct filed *, struct iovec *);
+int	getmsgbufsize(void);
 
 #define MAXFUNIX	21
 
diff --git a/usr.sbin/tcpdump/dhcp6opt.h b/usr.sbin/tcpdump/dhcp6opt.h
index 3b0ab033241..f36754d890a 100644
--- a/usr.sbin/tcpdump/dhcp6opt.h
+++ b/usr.sbin/tcpdump/dhcp6opt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcp6opt.h,v 1.1 2000/04/26 21:35:38 jakob Exp $	*/
+/*	$OpenBSD: dhcp6opt.h,v 1.2 2002/02/16 21:28:09 millert Exp $	*/
 
 /*
  * Copyright (C) 1998 and 1999 WIDE Project.
@@ -74,9 +74,9 @@ struct dhcp6_opt {
 extern struct dhcp6_opt *dh6o_pad;
 extern struct dhcp6_opt *dh6o_end;
 extern int dhcp6_param[];
-extern void dhcp6opttab_init __P((void));
-extern struct dhcp6_opt *dhcp6opttab_byname __P((char *));
-extern struct dhcp6_opt *dhcp6opttab_bycode __P((u_int));
+extern void dhcp6opttab_init(void);
+extern struct dhcp6_opt *dhcp6opttab_byname(char *);
+extern struct dhcp6_opt *dhcp6opttab_bycode(u_int);
 #endif
 
 #endif /*__DHCP6OPT_H_DEFINED*/
diff --git a/usr.sbin/tcpdump/print-dhcp6.c b/usr.sbin/tcpdump/print-dhcp6.c
index aae8aac8fd7..c309c0ce593 100644
--- a/usr.sbin/tcpdump/print-dhcp6.c
+++ b/usr.sbin/tcpdump/print-dhcp6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-dhcp6.c,v 1.3 2001/11/07 18:48:16 deraadt Exp $	*/
+/*	$OpenBSD: print-dhcp6.c,v 1.4 2002/02/16 21:28:09 millert Exp $	*/
 
 /*
  * Copyright (C) 1998 and 1999 WIDE Project.
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-dhcp6.c,v 1.3 2001/11/07 18:48:16 deraadt Exp $";
+    "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-dhcp6.c,v 1.4 2002/02/16 21:28:09 millert Exp $";
 #endif
 
 #ifdef INET6
@@ -62,10 +62,10 @@ struct rtentry;
 #include "dhcp6opt.h"
 
 #if 0
-static void dhcp6opttab_init __P((void));
-static struct dhcp6_opt *dhcp6opttab_byname __P((char *));
+static void dhcp6opttab_init(void);
+static struct dhcp6_opt *dhcp6opttab_byname(char *);
 #endif
-static struct dhcp6_opt *dhcp6opttab_bycode __P((u_int));
+static struct dhcp6_opt *dhcp6opttab_bycode(u_int);
 
 static char tstr[] = " [|dhcp6]";
 
diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c
index dba9bb27b37..65b64f9b375 100644
--- a/usr.sbin/traceroute/traceroute.c
+++ b/usr.sbin/traceroute/traceroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: traceroute.c,v 1.40 2001/08/12 12:03:03 heko Exp $	*/
+/*	$OpenBSD: traceroute.c,v 1.41 2002/02/16 21:28:10 millert Exp $	*/
 /*	$NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)traceroute.c	8.1 (Berkeley) 6/6/93";*/
 #else
-static char rcsid[] = "$OpenBSD: traceroute.c,v 1.40 2001/08/12 12:03:03 heko Exp $";
+static char rcsid[] = "$OpenBSD: traceroute.c,v 1.41 2002/02/16 21:28:10 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -268,13 +268,13 @@ int32_t usec_perturb;
 
 u_char packet[512], *outpacket;	/* last inbound (icmp) packet */
 
-int wait_for_reply __P((int, struct sockaddr_in *, struct timeval *));
-void send_probe __P((int, int, int, struct sockaddr_in *));
-int packet_ok __P((u_char *, int, struct sockaddr_in *, int, int));
-void print __P((u_char *, int, struct sockaddr_in *));
-char *inetname __P((struct in_addr));
-u_short in_cksum __P((u_short *, int));
-void usage __P((void));
+int wait_for_reply(int, struct sockaddr_in *, struct timeval *);
+void send_probe(int, int, int, struct sockaddr_in *);
+int packet_ok(u_char *, int, struct sockaddr_in *, int, int);
+void print(u_char *, int, struct sockaddr_in *);
+char *inetname(struct in_addr);
+u_short in_cksum(u_short *, int);
+void usage(void);
 
 int s;				/* receive (icmp) socket file descriptor */
 int sndsock;			/* send (udp) socket file descriptor */
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index d4427239c96..547e41b7a13 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: traceroute6.c,v 1.16 2001/10/26 06:23:02 mpech Exp $	*/
+/*	$OpenBSD: traceroute6.c,v 1.17 2002/02/16 21:28:10 millert Exp $	*/
 /*	$KAME: traceroute6.c,v 1.39 2000/12/22 15:11:05 itojun Exp $	*/
 
 /*
@@ -312,23 +312,23 @@ struct opacket {
 u_char	packet[512];		/* last inbound (icmp) packet */
 struct opacket	*outpacket;	/* last output (udp) packet */
 
-int	main __P((int, char *[]));
-int	wait_for_reply __P((int, struct msghdr *));
+int	main(int, char *[]);
+int	wait_for_reply(int, struct msghdr *);
 #ifdef IPSEC
 #ifdef IPSEC_POLICY_IPSEC
-int	setpolicy __P((int so, char *policy));
+int	setpolicy(int so, char *policy);
 #endif
 #endif
-void	send_probe __P((int, int));
-struct udphdr *get_udphdr __P((struct ip6_hdr *, u_char *));
-int	get_hoplim __P((struct msghdr *));
-double	deltaT __P((struct timeval *, struct timeval *));
-char	*pr_type __P((int));
-int	packet_ok __P((struct msghdr *, int, int));
-void	print __P((struct msghdr *, int));
-void	tvsub __P((struct timeval *, struct timeval *));
-const char *inetname __P((struct sockaddr *));
-void	usage __P((void));
+void	send_probe(int, int);
+struct udphdr *get_udphdr(struct ip6_hdr *, u_char *);
+int	get_hoplim(struct msghdr *);
+double	deltaT(struct timeval *, struct timeval *);
+char	*pr_type(int);
+int	packet_ok(struct msghdr *, int, int);
+void	print(struct msghdr *, int);
+void	tvsub(struct timeval *, struct timeval *);
+const char *inetname(struct sockaddr *);
+void	usage(void);
 
 int rcvsock;			/* receive (icmp) socket file descriptor */
 int sndsock;			/* send (udp) socket file descriptor */
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index e728f52c5c5..dcb2805453e 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trpt.c,v 1.8 2000/02/25 23:32:55 deraadt Exp $	*/
+/*	$OpenBSD: trpt.c,v 1.9 2002/02/16 21:28:10 millert Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -133,12 +133,12 @@ static int aflag, follow, sflag, tflag;
 
 extern	char *__progname;
 
-int	main __P((int, char *[]));
-void	dotrace __P((caddr_t));
+int	main(int, char *[]);
+void	dotrace(caddr_t);
 void	tcp_trace __P((short, short, struct tcpcb *, struct tcpcb *,
 	    struct tcpiphdr *, int));
-int	numeric __P((const void *, const void *));
-void	usage __P((void));
+int	numeric(const void *, const void *);
+void	usage(void);
 
 kvm_t	*kd;
 
diff --git a/usr.sbin/trsp/trsp.c b/usr.sbin/trsp/trsp.c
index cc6a7fd9ad8..f8ea088ac4f 100644
--- a/usr.sbin/trsp/trsp.c
+++ b/usr.sbin/trsp/trsp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trsp.c,v 1.7 1998/07/08 22:13:33 deraadt Exp $	*/
+/*	$OpenBSD: trsp.c,v 1.8 2002/02/16 21:28:10 millert Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -140,12 +140,12 @@ kvm_t	*kd;
 
 extern	char *__progname;
 
-int	main __P((int, char *[]));
-void	dotrace __P((caddr_t));
-int	numeric __P((const void *, const void *));
+int	main(int, char *[]);
+void	dotrace(caddr_t);
+int	numeric(const void *, const void *);
 void	spp_trace __P((short, short, struct sppcb *, struct sppcb *,
 	    struct spidp *, int));
-void	usage __P((void));
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 41919fdcb76..6fa3d0d4e51 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdevs.c,v 1.2 2001/09/17 17:29:56 mickey Exp $	*/
+/*	$OpenBSD: usbdevs.c,v 1.3 2002/02/16 21:28:10 millert Exp $	*/
 /*	$NetBSD: usbdevs.c,v 1.11 1999/09/08 02:39:36 augustss Exp $	*/
 
 /*
@@ -52,11 +52,11 @@
 int verbose;
 int showdevs;
 
-void usage __P((void));
-void usbdev __P((int f, int a, int rec));
-void usbdump __P((int f));
-void dumpone __P((char *name, int f, int addr));
-int main __P((int, char **));
+void usage(void);
+void usbdev(int f, int a, int rec);
+void usbdump(int f);
+void dumpone(char *name, int f, int addr);
+int main(int, char **);
 
 extern char *__progname;
 
diff --git a/usr.sbin/user/usermgmt.h b/usr.sbin/user/usermgmt.h
index 0acdf239588..638534be285 100644
--- a/usr.sbin/user/usermgmt.h
+++ b/usr.sbin/user/usermgmt.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usermgmt.h,v 1.3 2001/09/18 01:50:44 millert Exp $ */
+/* $OpenBSD: usermgmt.h,v 1.4 2002/02/16 21:28:10 millert Exp $ */
 /* $NetBSD: usermgmt.h,v 1.4 1999/12/24 09:08:51 agc Exp $ */
 
 /*
@@ -34,18 +34,18 @@
 #ifndef USERMGMT_H_
 #define USERMGMT_H_
 
-int useradd __P((int, char **));
-int usermod __P((int, char **));
-int userdel __P((int, char **));
-int groupadd __P((int, char **));
-int groupdel __P((int, char **));
-int groupmod __P((int, char **));
+int useradd(int, char **);
+int usermod(int, char **);
+int userdel(int, char **);
+int groupadd(int, char **);
+int groupdel(int, char **);
+int groupmod(int, char **);
 
 #ifdef EXTENSIONS
-int userinfo __P((int, char **));
-int groupinfo __P((int, char **));
+int userinfo(int, char **);
+int groupinfo(int, char **);
 #endif
 
-__dead void usermgmt_usage __P((const char *));
+__dead void usermgmt_usage(const char *);
 
 #endif
diff --git a/usr.sbin/videomode/videomode.c b/usr.sbin/videomode/videomode.c
index 91f49caa25a..9dfcf165b18 100644
--- a/usr.sbin/videomode/videomode.c
+++ b/usr.sbin/videomode/videomode.c
@@ -43,11 +43,11 @@
 #include <err.h>
 #include <stdio.h>
 
-void dump_mode __P((int));
-void dump_vm   __P((struct grfvideo_mode *));
-int  get_grf __P((void));
-void set_mode __P((int));
-void usage __P((void));
+void dump_mode(int);
+void dump_vm(struct grfvideo_mode *);
+int  get_grf(void);
+void set_mode(int);
+void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c
index 9d32fa659dc..8fa6044e455 100644
--- a/usr.sbin/vipw/vipw.c
+++ b/usr.sbin/vipw/vipw.c
@@ -55,8 +55,8 @@ static char sccsid[] = "@(#)vipw.c	8.3 (Berkeley) 4/2/94";
 #include <fcntl.h>
 #include <util.h>
 
-void	copyfile __P((int, int));
-void	usage __P((void));
+void	copyfile(int, int);
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/vnconfig/vnconfig.c b/usr.sbin/vnconfig/vnconfig.c
index 6fb22aa2374..e6925960144 100644
--- a/usr.sbin/vnconfig/vnconfig.c
+++ b/usr.sbin/vnconfig/vnconfig.c
@@ -62,8 +62,8 @@
 
 int verbose = 0;
 
-void usage __P((void));
-int config __P((char *, char *, int, char *));
+void usage(void);
+int config(char *, char *, int, char *);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/wsconscfg/wsconscfg.c b/usr.sbin/wsconscfg/wsconscfg.c
index cd23c9b4840..938d89d8945 100644
--- a/usr.sbin/wsconscfg/wsconscfg.c
+++ b/usr.sbin/wsconscfg/wsconscfg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsconscfg.c,v 1.6 2001/07/27 20:34:36 pvalchev Exp $ */
+/* $OpenBSD: wsconscfg.c,v 1.7 2002/02/16 21:28:10 millert Exp $ */
 /* $NetBSD: wsconscfg.c,v 1.4 1999/07/29 18:24:10 augustss Exp $ */
 
 /*
@@ -46,8 +46,8 @@
 
 #define DEFDEV "/dev/ttyCcfg"
 
-static void usage __P((void));
-int main __P((int, char**));
+static void usage(void);
+int main(int, char**);
 
 static void
 usage()
diff --git a/usr.sbin/wsfontload/wsfontload.c b/usr.sbin/wsfontload/wsfontload.c
index 8a243bbbefa..a89f94eca92 100644
--- a/usr.sbin/wsfontload/wsfontload.c
+++ b/usr.sbin/wsfontload/wsfontload.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsfontload.c,v 1.4 2001/03/14 02:51:36 mickey Exp $ */
+/* $OpenBSD: wsfontload.c,v 1.5 2002/02/16 21:28:10 millert Exp $ */
 /* $NetBSD: wsfontload.c,v 1.2 2000/01/05 18:46:43 ad Exp $ */
 
 /*
@@ -51,9 +51,9 @@
 #define DEFBITORDER	WSDISPLAY_FONTORDER_L2R
 #define DEFBYTEORDER	WSDISPLAY_FONTORDER_L2R
 
-int main __P((int, char**));
-static void usage __P((void));
-static int getencoding __P((char *));
+int main(int, char**);
+static void usage(void);
+static int getencoding(char *);
 
 static void
 usage()
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index 0be3fd8ea28..cd0852b67c4 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypbind.c,v 1.41 2001/12/29 00:50:29 deraadt Exp $ */
+/*	$OpenBSD: ypbind.c,v 1.42 2002/02/16 21:28:11 millert Exp $ */
 
 /*
  * Copyright (c) 1997,1998 Theo de Raadt <deraadt@OpenBSD.org>
@@ -35,7 +35,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: ypbind.c,v 1.41 2001/12/29 00:50:29 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ypbind.c,v 1.42 2002/02/16 21:28:11 millert Exp $";
 #endif
 
 #include <sys/param.h>
@@ -93,14 +93,14 @@ extern bool_t xdr_domainname(), xdr_ypbind_resp();
 extern bool_t xdr_ypreq_key(), xdr_ypresp_val();
 extern bool_t xdr_ypbind_setdom();
 
-void rpc_received __P((char *dom, struct sockaddr_in *raddrp, int force));
-void checkwork __P((void));
-enum clnt_stat handle_replies __P((void));
-enum clnt_stat handle_ping __P((void));
-int broadcast __P((struct _dom_binding *ypdb, char *, int));
-int direct __P((struct _dom_binding *ypdb, char *, int));
-int ping __P((struct _dom_binding *ypdb));
-int pings __P((struct _dom_binding *ypdb));
+void rpc_received(char *dom, struct sockaddr_in *raddrp, int force);
+void checkwork(void);
+enum clnt_stat handle_replies(void);
+enum clnt_stat handle_ping(void);
+int broadcast(struct _dom_binding *ypdb, char *, int);
+int direct(struct _dom_binding *ypdb, char *, int);
+int ping(struct _dom_binding *ypdb);
+int pings(struct _dom_binding *ypdb);
 
 char *domain;
 
@@ -121,8 +121,8 @@ u_long rmtcr_port;
 SVCXPRT *udptransp, *tcptransp;
 SVCXPRT *ludptransp, *ltcptransp;
 
-struct _dom_binding *xid2ypdb __P((u_int32_t xid));
-u_int32_t unique_xid __P((struct _dom_binding *ypdb));
+struct _dom_binding *xid2ypdb(u_int32_t xid);
+u_int32_t unique_xid(struct _dom_binding *ypdb);
 
 /*
  * We name the local RPC functions ypbindproc_XXX_2x() instead
diff --git a/usr.sbin/ypserv/common/ypdb.h b/usr.sbin/ypserv/common/ypdb.h
index 80aac6ce77b..d3a74f7bdc7 100644
--- a/usr.sbin/ypserv/common/ypdb.h
+++ b/usr.sbin/ypserv/common/ypdb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypdb.h,v 1.5 1997/02/09 09:49:37 maja Exp $ */
+/*	$OpenBSD: ypdb.h,v 1.6 2002/02/16 21:28:11 millert Exp $ */
 
 /*
  * Copyright (c) 1990, 1993
@@ -64,14 +64,14 @@ typedef struct {
 typedef DB DBM;
 
 __BEGIN_DECLS
-void	 ypdb_close __P((DBM *));
-datum	 ypdb_fetch __P((DBM *, datum));
-datum	 ypdb_firstkey __P((DBM *));
-datum	 ypdb_nextkey __P((DBM *));
-datum	 ypdb_setkey __P((DBM *, datum));
-DBM     *ypdb_open __P((const char *, int, int));
-DBM     *ypdb_open_suf __P((const char *, int, int));
-int	 ypdb_store __P((DBM *, datum, datum, int));
+void	 ypdb_close(DBM *);
+datum	 ypdb_fetch(DBM *, datum);
+datum	 ypdb_firstkey(DBM *);
+datum	 ypdb_nextkey(DBM *);
+datum	 ypdb_setkey(DBM *, datum);
+DBM     *ypdb_open(const char *, int, int);
+DBM     *ypdb_open_suf(const char *, int, int);
+int	 ypdb_store(DBM *, datum, datum, int);
 __END_DECLS
 
 #endif /* !_YPDB_H_ */
diff --git a/usr.sbin/ypserv/common/yplib_host.h b/usr.sbin/ypserv/common/yplib_host.h
index 814315d79c1..caa88ae235f 100644
--- a/usr.sbin/ypserv/common/yplib_host.h
+++ b/usr.sbin/ypserv/common/yplib_host.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yplib_host.h,v 1.4 1997/05/01 22:14:45 niklas Exp $ */
+/*	$OpenBSD: yplib_host.h,v 1.5 2002/02/16 21:28:11 millert Exp $ */
 
 /*
  * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@theos.com>
@@ -51,7 +51,7 @@ int	yp_all_host	__P((CLIENT *client, char *indomain, char *inmap,
 			    struct ypall_callback *incallback));
 int	yp_maplist_host	__P((CLIENT *client, char *indomain,
 			    struct ypmaplist **outmaplist));
-CLIENT *yp_bind_local	__P((u_long program, u_long version));
+CLIENT *yp_bind_local(u_long program, u_long version);
 CLIENT *yp_bind_host	__P((char *server, u_long program, u_long version,
 			    u_short port, int usetcp));
 
diff --git a/usr.sbin/ypserv/common/yplog.h b/usr.sbin/ypserv/common/yplog.h
index 2f48494a272..0d847ad2b71 100644
--- a/usr.sbin/ypserv/common/yplog.h
+++ b/usr.sbin/ypserv/common/yplog.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yplog.h,v 1.3 1996/05/30 09:53:04 deraadt Exp $ */
+/*	$OpenBSD: yplog.h,v 1.4 2002/02/16 21:28:11 millert Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -33,10 +33,10 @@
 #define _YPLOG_H_
 
 __BEGIN_DECLS
-void    yplog __P((const char *, ...));
-void    vyplog __P((const char *, _BSD_VA_LIST_));
-void	ypopenlog __P((void));
-void	ypcloselog __P((void));
+void    yplog(const char *, ...);
+void    vyplog(const char *, _BSD_VA_LIST_);
+void	ypopenlog(void);
+void	ypcloselog(void);
 __END_DECLS
 
 #endif /* !_YPLOG_H_ */
diff --git a/usr.sbin/ypserv/makedbm/db.h b/usr.sbin/ypserv/makedbm/db.h
index 174a67bc16f..2a5a6569bae 100644
--- a/usr.sbin/ypserv/makedbm/db.h
+++ b/usr.sbin/ypserv/makedbm/db.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db.h,v 1.1 1997/07/22 10:52:59 maja Exp $ */
+/*	$OpenBSD: db.h,v 1.2 2002/02/16 21:28:11 millert Exp $ */
 
 /*
  * Copyright (c) 1997 Mats O Jansson <moj@stacken.kth.se>
@@ -35,7 +35,7 @@
 #define _MAKEDBM_DB_H_
 
 __BEGIN_DECLS
-int		db_hash_list_database __P((char *));
+int		db_hash_list_database(char *);
 __END_DECLS
 
 #endif /* !_MAKEDBM_DB_H_ */
diff --git a/usr.sbin/ypserv/revnetgroup/hash.h b/usr.sbin/ypserv/revnetgroup/hash.h
index a01c28b5fe3..264a3fd2ca4 100644
--- a/usr.sbin/ypserv/revnetgroup/hash.h
+++ b/usr.sbin/ypserv/revnetgroup/hash.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hash.h,v 1.1 1997/04/15 22:06:12 maja Exp $ */
+/* $OpenBSD: hash.h,v 1.2 2002/02/16 21:28:11 millert Exp $ */
 /*
  * Copyright (c) 1995
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -60,9 +60,9 @@ struct group_entry {
 
 #define LINSIZ 1024 * 10
 
-extern void store __P(( struct group_entry ** , char *, char * ));
-extern void mstore __P(( struct member_entry ** , char *, char *, char * ));
-extern char *lookup __P(( struct group_entry **, char * ));
-extern void __endnetgrent __P(( void ));
-extern void __setnetgrent __P(( char * ));
-extern int __getnetgrent __P(( char **, char **, char ** ));
+extern void store( struct group_entry ** , char *, char * );
+extern void mstore( struct member_entry ** , char *, char *, char * );
+extern char *lookup( struct group_entry **, char * );
+extern void __endnetgrent( void );
+extern void __setnetgrent( char * );
+extern int __getnetgrent( char **, char **, char ** );
diff --git a/usr.sbin/ypserv/ypserv/acl.h b/usr.sbin/ypserv/ypserv/acl.h
index 215d7180141..c8883a21bb6 100644
--- a/usr.sbin/ypserv/ypserv/acl.h
+++ b/usr.sbin/ypserv/ypserv/acl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acl.h,v 1.4 1996/06/30 19:46:05 maja Exp $ */
+/*	$OpenBSD: acl.h,v 1.5 2002/02/16 21:28:11 millert Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -76,10 +76,10 @@ struct	aclent	*next;
 };
 
 __BEGIN_DECLS
-int		acl_check_host __P((struct in_addr *));
-int		acl_init __P((char *));
-int		acl_securenet __P((char *));
-void		acl_reset __P((void));
+int		acl_check_host(struct in_addr *);
+int		acl_init(char *);
+int		acl_securenet(char *);
+void		acl_reset(void);
 __END_DECLS
 
 #endif /* !_ACL_H_ */
diff --git a/usr.sbin/ypserv/ypserv/ypserv.c b/usr.sbin/ypserv/ypserv/ypserv.c
index b1ab9a3e37d..944fb7cac0d 100644
--- a/usr.sbin/ypserv/ypserv/ypserv.c
+++ b/usr.sbin/ypserv/ypserv/ypserv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypserv.c,v 1.18 2001/12/05 10:02:16 deraadt Exp $ */
+/*	$OpenBSD: ypserv.c,v 1.19 2002/02/16 21:28:11 millert Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: ypserv.c,v 1.18 2001/12/05 10:02:16 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ypserv.c,v 1.19 2002/02/16 21:28:11 millert Exp $";
 #endif
 
 #include <sys/types.h>
@@ -86,7 +86,7 @@ volatile sig_atomic_t wantsighup;
 
 extern	int __svc_fdsetsize;
 extern	fd_set *__svc_fdset;
-extern	void svc_getreqset2 __P((fd_set *, int));
+extern	void svc_getreqset2(fd_set *, int);
 
 static
 void _msgout(char* msg)