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.

44 files changed, 354 insertions, 354 deletions

diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index 6ed841cdefa..fa89abbf840 100644
--- a/libexec/comsat/comsat.c
+++ b/libexec/comsat/comsat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: comsat.c,v 1.20 2001/12/07 18:45:32 mpech Exp $	*/
+/*	$OpenBSD: comsat.c,v 1.21 2002/02/16 21:27:29 millert Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)comsat.c	8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: comsat.c,v 1.20 2001/12/07 18:45:32 mpech Exp $";
+static char rcsid[] = "$OpenBSD: comsat.c,v 1.21 2002/02/16 21:27:29 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -77,12 +77,12 @@ struct	utmp *utmp = NULL;
 time_t	lastmsgtime;
 int	nutmp, uf;
 
-void jkfprintf __P((FILE *, char[], off_t));
-void mailfor __P((char *));
-void notify __P((struct utmp *, off_t));
-void readutmp __P((int));
-void doreadutmp __P((void));
-void reapchildren __P((int));
+void jkfprintf(FILE *, char[], off_t);
+void mailfor(char *);
+void notify(struct utmp *, off_t);
+void readutmp(int);
+void doreadutmp(void);
+void reapchildren(int);
 
 volatile sig_atomic_t wantreadutmp;
 
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index 39f0c0f0fe6..ebff51bd573 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fingerd.c,v 1.24 2001/12/07 18:45:32 mpech Exp $	*/
+/*	$OpenBSD: fingerd.c,v 1.25 2002/02/16 21:27:29 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -43,7 +43,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "from: @(#)fingerd.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: fingerd.c,v 1.24 2001/12/07 18:45:32 mpech Exp $";
+static char rcsid[] = "$OpenBSD: fingerd.c,v 1.25 2002/02/16 21:27:29 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -61,8 +61,8 @@ static char rcsid[] = "$OpenBSD: fingerd.c,v 1.24 2001/12/07 18:45:32 mpech Exp
 #include <string.h>
 #include "pathnames.h"
 
-void err __P((const char *, ...));
-void usage __P((void));
+void err(const char *, ...);
+void usage(void);
 
 void
 usage()
diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h
index 73b43bcf4d6..edf358102fb 100644
--- a/libexec/ftpd/extern.h
+++ b/libexec/ftpd/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.6 2001/01/28 19:34:27 niklas Exp $	*/
+/*	$OpenBSD: extern.h,v 1.7 2002/02/16 21:27:29 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.2 1995/04/11 02:44:49 cgd Exp $	*/
 
 /*
@@ -65,46 +65,46 @@
  *	@(#)extern.h	8.2 (Berkeley) 4/4/94
  */
 
-void	blkfree __P((char **));
-char  **copyblk __P((char **));
-void	cwd __P((char *));
-void	delete __P((char *));
-void	dologout __P((int));
-void	fatal __P((char *));
-int	ftpd_pclose __P((FILE *));
-FILE   *ftpd_popen __P((char *, char *));
-char   *getline __P((char *, int, FILE *));
-void	ftpdlogwtmp __P((char *, char *, char *));
-void	lreply __P((int, const char *, ...));
-void	makedir __P((char *));
-void	nack __P((char *));
-void	pass __P((char *));
-void	passive __P((void));
-int	lpsvproto2af __P((int));
-int	af2lpsvproto __P((int));
-int	epsvproto2af __P((int));
-int	af2epsvproto __P((int));
-void	long_passive __P((char *, int));
-int	extended_port __P((const char *));
-void	epsv_protounsupp __P((const char *));
-void	perror_reply __P((int, char *));
-void	pwd __P((void));
-void	removedir __P((char *));
-void	renamecmd __P((char *, char *));
-char   *renamefrom __P((char *));
-void	reply __P((int, const char *, ...));
-void	retrieve __P((char *, char *));
-void	send_file_list __P((char *));
-void	setproctitle __P((const char *, ...));
-void	statcmd __P((void));
-void	statfilecmd __P((char *));
-void	store __P((char *, char *, int));
-void	upper __P((char *));
-void	user __P((char *));
-void	yyerror __P((char *));
-void	toolong __P((int));
+void	blkfree(char **);
+char  **copyblk(char **);
+void	cwd(char *);
+void	delete(char *);
+void	dologout(int);
+void	fatal(char *);
+int	ftpd_pclose(FILE *);
+FILE   *ftpd_popen(char *, char *);
+char   *getline(char *, int, FILE *);
+void	ftpdlogwtmp(char *, char *, char *);
+void	lreply(int, const char *, ...);
+void	makedir(char *);
+void	nack(char *);
+void	pass(char *);
+void	passive(void);
+int	lpsvproto2af(int);
+int	af2lpsvproto(int);
+int	epsvproto2af(int);
+int	af2epsvproto(int);
+void	long_passive(char *, int);
+int	extended_port(const char *);
+void	epsv_protounsupp(const char *);
+void	perror_reply(int, char *);
+void	pwd(void);
+void	removedir(char *);
+void	renamecmd(char *, char *);
+char   *renamefrom(char *);
+void	reply(int, const char *, ...);
+void	retrieve(char *, char *);
+void	send_file_list(char *);
+void	setproctitle(const char *, ...);
+void	statcmd(void);
+void	statfilecmd(char *);
+void	store(char *, char *, int);
+void	upper(char *);
+void	user(char *);
+void	yyerror(char *);
+void	toolong(int);
 
-int	yyparse __P((void));
+int	yyparse(void);
 
 union sockunion {
 	struct sockinet {
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 58f862029e3..11388f6d78e 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ftpcmd.y,v 1.37 2002/01/30 18:01:46 mpech Exp $	*/
+/*	$OpenBSD: ftpcmd.y,v 1.38 2002/02/16 21:27:29 millert Exp $	*/
 /*	$NetBSD: ftpcmd.y,v 1.7 1996/04/08 19:03:11 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@
 #if 0
 static char sccsid[] = "@(#)ftpcmd.y	8.3 (Berkeley) 4/6/94";
 #else
-static char rcsid[] = "$OpenBSD: ftpcmd.y,v 1.37 2002/01/30 18:01:46 mpech Exp $";
+static char rcsid[] = "$OpenBSD: ftpcmd.y,v 1.38 2002/02/16 21:27:29 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -1058,11 +1058,11 @@ struct tab sitetab[] = {
 	{ NULL,   0,    0,    0,	0 }
 };
 
-static void	 help __P((struct tab *, char *));
+static void	 help(struct tab *, char *);
 static struct tab *
-		 lookup __P((struct tab *, char *));
-static void	 sizecmd __P((char *));
-static int	 yylex __P((void));
+		 lookup(struct tab *, char *);
+static void	 sizecmd(char *);
+static int	 yylex(void);
 
 extern int epsvall;
 
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index ba6c182d120..9317e544a6a 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ftpd.c,v 1.119 2002/02/01 05:02:49 itojun Exp $	*/
+/*	$OpenBSD: ftpd.c,v 1.120 2002/02/16 21:27:29 millert Exp $	*/
 /*	$NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $	*/
 
 /*
@@ -73,7 +73,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)ftpd.c	8.4 (Berkeley) 4/16/94";
 #else
-static char rcsid[] = "$OpenBSD: ftpd.c,v 1.119 2002/02/01 05:02:49 itojun Exp $";
+static char rcsid[] = "$OpenBSD: ftpd.c,v 1.120 2002/02/16 21:27:29 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -235,29 +235,29 @@ char	proctitle[BUFSIZ];	/* initial part of title */
 			cmd, (*(file) == '/') ? "" : curdir(), file, cnt); \
 	}
 
-static void	 ack __P((char *));
-static void	 sigurg __P((int));
-static void	 myoob __P((void));
-static int	 checkuser __P((char *, char *));
-static FILE	*dataconn __P((char *, off_t, char *));
-static void	 dolog __P((struct sockaddr *));
-static char	*copy_dir __P((char *, struct passwd *));
-static char	*curdir __P((void));
-static void	 end_login __P((void));
-static FILE	*getdatasock __P((char *));
-static int	guniquefd __P((char *, char **));
-static void	 lostconn __P((int));
-static void	 sigquit __P((int));
-static int	 receive_data __P((FILE *, FILE *));
-static void	 replydirname __P((const char *, const char *));
-static int	 send_data __P((FILE *, FILE *, off_t, off_t, int));
+static void	 ack(char *);
+static void	 sigurg(int);
+static void	 myoob(void);
+static int	 checkuser(char *, char *);
+static FILE	*dataconn(char *, off_t, char *);
+static void	 dolog(struct sockaddr *);
+static char	*copy_dir(char *, struct passwd *);
+static char	*curdir(void);
+static void	 end_login(void);
+static FILE	*getdatasock(char *);
+static int	guniquefd(char *, char **);
+static void	 lostconn(int);
+static void	 sigquit(int);
+static int	 receive_data(FILE *, FILE *);
+static void	 replydirname(const char *, const char *);
+static int	 send_data(FILE *, FILE *, off_t, off_t, int);
 static struct passwd *
-		 sgetpwnam __P((char *));
-static void	 reapchild __P((int));
-static int	 check_host __P((struct sockaddr *));
-static void	 usage __P((void));
+		 sgetpwnam(char *);
+static void	 reapchild(int);
+static int	 check_host(struct sockaddr *);
+static void	 usage(void);
 
-void	 logxfer __P((char *, off_t, time_t));
+void	 logxfer(char *, off_t, time_t);
 
 static char *
 curdir()
@@ -1125,7 +1125,7 @@ retrieve(cmd, name)
 {
 	FILE *fin, *dout;
 	struct stat st;
-	int (*closefunc) __P((FILE *));
+	int (*closefunc)(FILE *);
 	time_t start;
 
 	if (cmd == 0) {
@@ -1199,7 +1199,7 @@ store(name, mode, unique)
 	int unique;
 {
 	FILE *fout, *din;
-	int (*closefunc) __P((FILE *));
+	int (*closefunc)(FILE *);
 	struct stat st;
 	int fd;
 
diff --git a/libexec/getNAME/getNAME.c b/libexec/getNAME/getNAME.c
index adf2d00c58d..0de367f51b7 100644
--- a/libexec/getNAME/getNAME.c
+++ b/libexec/getNAME/getNAME.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getNAME.c,v 1.7 2001/12/07 18:45:32 mpech Exp $	*/
+/*	$OpenBSD: getNAME.c,v 1.8 2002/02/16 21:27:29 millert Exp $	*/
 /*	$NetBSD: getNAME.c,v 1.7.2.1 1997/11/10 19:54:46 thorpej Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)getNAME.c	8.1 (Berkeley) 6/30/93";
 #else
-static char rcsid[] = "$OpenBSD: getNAME.c,v 1.7 2001/12/07 18:45:32 mpech Exp $";
+static char rcsid[] = "$OpenBSD: getNAME.c,v 1.8 2002/02/16 21:27:29 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -64,13 +64,13 @@ int tocrc;
 int intro;
 int typeflag;
 
-void doname __P((char *));
-void dorefname __P((char *));
-void getfrom __P((char *));
-void split __P((char *, char *));
-void trimln __P((char *));
-void usage __P((void));
-int main __P((int, char *[]));
+void doname(char *);
+void dorefname(char *);
+void getfrom(char *);
+void split(char *, char *);
+void trimln(char *);
+void usage(void);
+int main(int, char *[]);
 
 int
 main(argc, argv)
diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h
index 9bf59caa4dc..9ed1e4a6554 100644
--- a/libexec/getty/extern.h
+++ b/libexec/getty/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.3 2001/01/28 19:34:28 niklas Exp $*/
+/*	$OpenBSD: extern.h,v 1.4 2002/02/16 21:27:30 millert Exp $*/
 
 /*
  * Copyright (c) 1993
@@ -37,20 +37,20 @@
 
 struct delayval;
 
-int	 adelay __P((int, struct delayval *));
-char	*autobaud __P((void));
-int	 delaybits __P((void));
-void	 edithost __P((char *));
-void	 gendefaults __P((void));
-int	 getent __P((char *, char *));
-int	 getflag __P((char *));
-long	 getnum __P((char *));
-char	*getstr __P((char *, char **));
-void	 gettable __P((char *, char *));
-void	 makeenv __P((char *[]));
-char	*portselector __P((void));
-void	 set_ttydefaults __P((int));
-void	 setchars __P((void));
-void	 setdefaults __P((void));
-void	 setflags __P((int));
-int	 speed __P((int));
+int	 adelay(int, struct delayval *);
+char	*autobaud(void);
+int	 delaybits(void);
+void	 edithost(char *);
+void	 gendefaults(void);
+int	 getent(char *, char *);
+int	 getflag(char *);
+long	 getnum(char *);
+char	*getstr(char *, char **);
+void	 gettable(char *, char *);
+void	 makeenv(char *[]);
+char	*portselector(void);
+void	 set_ttydefaults(int);
+void	 setchars(void);
+void	 setdefaults(void);
+void	 setflags(int);
+int	 speed(int);
diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h
index aeab6128486..faee8e2a714 100644
--- a/libexec/getty/gettytab.h
+++ b/libexec/getty/gettytab.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gettytab.h,v 1.4 2001/01/28 19:34:28 niklas Exp $*/
+/*	$OpenBSD: gettytab.h,v 1.5 2002/02/16 21:27:30 millert Exp $*/
 
 /*
  * Copyright (c) 1983, 1993, 1994
@@ -162,10 +162,10 @@ struct gettyflags {
 #define	NP	gettyflags[21].value
 #define	MB	gettyflags[22].value
 
-int	getent __P((char *, char *));
-long	getnum __P((char *));
-int	getflag __P((char *));
-char	*getstr __P((char *, char **));
+int	getent(char *, char *);
+long	getnum(char *);
+int	getflag(char *);
+char	*getstr(char *, char **);
 
 extern	struct gettyflags gettyflags[];
 extern	struct gettynums gettynums[];
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index 71f9ffa63fe..577b62a2b3e 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.20 2001/11/19 22:35:04 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.21 2002/02/16 21:27:30 millert Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)main.c	8.1 (Berkeley) 6/20/93";*/
-static char rcsid[] = "$OpenBSD: main.c,v 1.20 2001/11/19 22:35:04 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.21 2002/02/16 21:27:30 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -160,13 +160,13 @@ timeoverrun(signo)
 	_exit(1);
 }
 
-static int	getname __P((void));
-static void	oflush __P((void));
-static void	prompt __P((void));
-static void	putchr __P((int));
-static void	putf __P((char *));
-static void	putpad __P((char *));
-static void	xputs __P((char *));
+static int	getname(void);
+static void	oflush(void);
+static void	prompt(void);
+static void	putchr(int);
+static void	putf(char *);
+static void	putpad(char *);
+static void	xputs(char *);
 
 int
 main(argc, argv)
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c
index d57cc2f6e23..d906d6b5f78 100644
--- a/libexec/getty/subr.c
+++ b/libexec/getty/subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr.c,v 1.14 2001/11/19 01:08:14 deraadt Exp $	*/
+/*	$OpenBSD: subr.c,v 1.15 2002/02/16 21:27:30 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)subr.c	8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: subr.c,v 1.14 2001/11/19 01:08:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: subr.c,v 1.15 2002/02/16 21:27:30 millert Exp $";
 #endif /* not lint */
 
 /*
@@ -54,7 +54,7 @@ static char rcsid[] = "$OpenBSD: subr.c,v 1.14 2001/11/19 01:08:14 deraadt Exp $
 
 extern	struct termios tmode, omode;
 
-static void	compatflags __P((long));
+static void	compatflags(long);
 
 /*
  * Get a table entry.
diff --git a/libexec/identd/identd.h b/libexec/identd/identd.h
index 45093c544df..73f2c5e20b6 100644
--- a/libexec/identd/identd.h
+++ b/libexec/identd/identd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: identd.h,v 1.9 2001/08/08 07:02:42 deraadt Exp $*/
+/*	$OpenBSD: identd.h,v 1.10 2002/02/16 21:27:30 millert Exp $*/
 
 /*
 **
@@ -39,12 +39,12 @@ extern char *indirect_password;
 extern int lport;
 extern int fport;
 
-int	parse __P((int, struct in_addr *, struct in_addr *));
-int	parse6 __P((int, struct sockaddr_in6 *, struct sockaddr_in6 *));
-char	*gethost4 __P((struct sockaddr_in *));
-char	*gethost4_addr __P((struct in_addr *));
-char	*gethost6 __P((struct sockaddr_in6 *));
-int	k_getuid __P((struct in_addr *, int, struct in_addr *, int, uid_t *));
+int	parse(int, struct in_addr *, struct in_addr *);
+int	parse6(int, struct sockaddr_in6 *, struct sockaddr_in6 *);
+char	*gethost4(struct sockaddr_in *);
+char	*gethost4_addr(struct in_addr *);
+char	*gethost6(struct sockaddr_in6 *);
+int	k_getuid(struct in_addr *, int, struct in_addr *, int, uid_t *);
 int	k_getuid6 __P((struct sockaddr_in6 *, int, struct sockaddr_in6 *,
 	int, uid_t *));
 
diff --git a/libexec/identd/parse.c b/libexec/identd/parse.c
index 7be252081fa..c43bb4f06fa 100644
--- a/libexec/identd/parse.c
+++ b/libexec/identd/parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.c,v 1.28 2002/01/07 08:13:31 mpech Exp $	*/
+/*	$OpenBSD: parse.c,v 1.29 2002/02/16 21:27:30 millert Exp $	*/
 
 /*
  * This program is in the public domain and may be used freely by anyone
@@ -30,10 +30,10 @@
 
 #define IO_TIMEOUT	30	/* Timeout I/O operations after N seconds */
 
-int check_noident __P((char *));
-ssize_t timed_read __P((int, void *, size_t, time_t));
-ssize_t timed_write __P((int, const void *, size_t, time_t));
-void gentoken __P((char *, int));
+int check_noident(char *);
+ssize_t timed_read(int, void *, size_t, time_t);
+ssize_t timed_write(int, const void *, size_t, time_t);
+void gentoken(char *, int);
 
 /*
  * A small routine to check for the existence of the ".noident"
diff --git a/libexec/ld.so/alpha/archdep.h b/libexec/ld.so/alpha/archdep.h
index 96a2f3f2163..c599ab776b6 100644
--- a/libexec/ld.so/alpha/archdep.h
+++ b/libexec/ld.so/alpha/archdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archdep.h,v 1.3 2001/06/08 06:52:32 art Exp $ */
+/*	$OpenBSD: archdep.h,v 1.4 2002/02/16 21:27:30 millert Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -45,7 +45,7 @@
 #include <elf_abi.h>
 #include <machine/reloc.h>
 
-int	_dl_write __P((int, const char *, int));
+int	_dl_write(int, const char *, int);
 
 /*
  *	The following functions are declared inline so they can
diff --git a/libexec/ld.so/alpha/syscall.h b/libexec/ld.so/alpha/syscall.h
index 02ddf74ff33..367579f6bec 100644
--- a/libexec/ld.so/alpha/syscall.h
+++ b/libexec/ld.so/alpha/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.1 2001/05/14 22:18:22 niklas Exp $ */
+/*	$OpenBSD: syscall.h,v 1.2 2002/02/16 21:27:30 millert Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -42,23 +42,23 @@
 #define _dl_check_error(__res) \
     ((int) __res < 0 && (int) __res >= -_dl_MAX_ERRNO)
 
-int	_dl_close __P((int));
-int	_dl_exit __P((int));
-int	_dl_getegid __P((void));
-int	_dl_geteuid __P((void));
-int	_dl_getgid __P((void));
-int	_dl_getuid __P((void));
+int	_dl_close(int);
+int	_dl_exit(int);
+int	_dl_getegid(void);
+int	_dl_geteuid(void);
+int	_dl_getgid(void);
+int	_dl_getuid(void);
 long	_dl_mmap __P((void *, unsigned int, unsigned int, unsigned int, int,
 		      off_t));
-int	_dl_mprotect __P((const void *, int, int));
-int	_dl_munmap __P((const void*, unsigned int));
-int	_dl_open __P((const char*, unsigned int));
-void	_dl_printf __P((const char *, ...));
-int	_dl_read __P((int, const char*, int));
+int	_dl_mprotect(const void *, int, int);
+int	_dl_munmap(const void*, unsigned int);
+int	_dl_open(const char*, unsigned int);
+void	_dl_printf(const char *, ...);
+int	_dl_read(int, const char*, int);
 #ifdef USE_CACHE
-int	_dl_stat __P((const char *, struct stat *));
+int	_dl_stat(const char *, struct stat *);
 #endif
-int	_dl_write __P((int, const char*, int));
+int	_dl_write(int, const char*, int);
 
 /*
  * Not an actual syscall, but we need something in assembly to say
diff --git a/libexec/ld.so/dl_printf.c b/libexec/ld.so/dl_printf.c
index 1e0f3fa6531..db3e38d479b 100644
--- a/libexec/ld.so/dl_printf.c
+++ b/libexec/ld.so/dl_printf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl_printf.c,v 1.2 2001/06/06 12:38:44 art Exp $	*/
+/*	$OpenBSD: dl_printf.c,v 1.3 2002/02/16 21:27:30 millert Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -70,8 +70,8 @@
 static void kprintn __P((void (*)(int), u_long, int));
 static void kdoprnt __P((void (*)(int), const char *, va_list));
 
-static void putchar __P((int));
-static void sputchar __P((int));
+static void putchar(int);
+static void sputchar(int);
 static char *sbuf;
 
 static void
diff --git a/libexec/ld.so/ldconfig/ld.h b/libexec/ld.so/ldconfig/ld.h
index cb00ad572fa..d9b9be014d8 100644
--- a/libexec/ld.so/ldconfig/ld.h
+++ b/libexec/ld.so/ldconfig/ld.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ld.h,v 1.3 2001/01/30 02:39:04 brad Exp $ */
+/* $OpenBSD: ld.h,v 1.4 2002/02/16 21:27:30 millert Exp $ */
 /*
  * Header file to make code compatible with ELF version 
  * ldconfig was taken from the a.out ld.
@@ -7,9 +7,9 @@
 
 extern int	n_search_dirs;
 extern char	**search_dirs;
-char	*xstrdup __P((char *));
-void	*xmalloc __P((size_t));
-void	*xrealloc __P((void *, size_t));
-char	*concat __P((const char *, const char *, const char *));
+char	*xstrdup(char *);
+void	*xmalloc(size_t);
+void	*xrealloc(void *, size_t);
+char	*concat(const char *, const char *, const char *);
 
 #define PAGSIZ	__LDPGSZ
diff --git a/libexec/ld.so/ldconfig/ldconfig.c b/libexec/ld.so/ldconfig/ldconfig.c
index 70cd9906a2e..2442752b2fe 100644
--- a/libexec/ld.so/ldconfig/ldconfig.c
+++ b/libexec/ld.so/ldconfig/ldconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldconfig.c,v 1.6 2001/12/07 18:45:32 mpech Exp $	*/
+/*	$OpenBSD: ldconfig.c,v 1.7 2002/02/16 21:27:30 millert Exp $	*/
 
 /*
  * Copyright (c) 1993,1995 Paul Kranenburg
@@ -79,11 +79,11 @@ struct shlib_list {
 static struct shlib_list	*shlib_head = NULL, **shlib_tail = &shlib_head;
 static char			*dir_list;
 
-static void	enter __P((char *, char *, char *, int *, int));
-static int	dodir __P((char *, int));
-static int	buildhints __P((void));
-static int	readhints __P((void));
-static void	listhints __P((void));
+static void	enter(char *, char *, char *, int *, int);
+static int	dodir(char *, int);
+static int	buildhints(void);
+static int	readhints(void);
+static void	listhints(void);
 
 int
 main(argc, argv)
diff --git a/libexec/ld.so/sparc64/archdep.h b/libexec/ld.so/sparc64/archdep.h
index 3ddd8b3c92c..cd2ea9b3abe 100644
--- a/libexec/ld.so/sparc64/archdep.h
+++ b/libexec/ld.so/sparc64/archdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archdep.h,v 1.4 2001/09/25 06:57:03 art Exp $ */
+/*	$OpenBSD: archdep.h,v 1.5 2002/02/16 21:27:30 millert Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -47,7 +47,7 @@
 #include <machine/reloc.h>
 #include <sys/syscall.h>
 
-int	_dl_write __P((int, const char *, int));
+int	_dl_write(int, const char *, int);
 
 /*
  *	The following functions are declared inline so they can
diff --git a/libexec/ld.so/sparc64/syscall.h b/libexec/ld.so/sparc64/syscall.h
index 52d6f7a85b3..9233615d393 100644
--- a/libexec/ld.so/sparc64/syscall.h
+++ b/libexec/ld.so/sparc64/syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.h,v 1.2 2001/09/25 06:57:03 art Exp $ */
+/*	$OpenBSD: syscall.h,v 1.3 2002/02/16 21:27:30 millert Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -42,22 +42,22 @@
 #define _dl_check_error(__res) \
     ((int) __res < 0 && (int) __res >= -_dl_MAX_ERRNO)
 
-int	_dl_close __P((int));
-int	_dl_exit __P((int));
-int	_dl_getegid __P((void));
-int	_dl_geteuid __P((void));
-int	_dl_getgid __P((void));
-int	_dl_getuid __P((void));
+int	_dl_close(int);
+int	_dl_exit(int);
+int	_dl_getegid(void);
+int	_dl_geteuid(void);
+int	_dl_getgid(void);
+int	_dl_getuid(void);
 long	_dl___syscall(quad_t, ...);
-int	_dl_mprotect __P((const void *, int, int));
-int	_dl_munmap __P((const void*, unsigned int));
-int	_dl_open __P((const char*, unsigned int));
-void	_dl_printf __P((const char *, ...));
-int	_dl_read __P((int, const char*, int));
+int	_dl_mprotect(const void *, int, int);
+int	_dl_munmap(const void*, unsigned int);
+int	_dl_open(const char*, unsigned int);
+void	_dl_printf(const char *, ...);
+int	_dl_read(int, const char*, int);
 #ifdef USE_CACHE
-int	_dl_stat __P((const char *, struct stat *));
+int	_dl_stat(const char *, struct stat *);
 #endif
-int	_dl_write __P((int, const char*, int));
+int	_dl_write(int, const char*, int);
 
 /*
  * Not an actual syscall, but we need something in assembly to say
diff --git a/libexec/lfs_cleanerd/clean.h b/libexec/lfs_cleanerd/clean.h
index 272fb91059c..492c56c8f8f 100644
--- a/libexec/lfs_cleanerd/clean.h
+++ b/libexec/lfs_cleanerd/clean.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clean.h,v 1.2 1996/07/01 11:04:55 downsj Exp $	*/
+/*	$OpenBSD: clean.h,v 1.3 2002/02/16 21:27:30 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -106,15 +106,15 @@ typedef struct fs_info {
 	(i) % (fs)->lfs_sepb)
 
 __BEGIN_DECLS
-int	 dump_summary __P((struct lfs *, SEGSUM *, u_long, daddr_t **));
-void	 err __P((const int, const char *, ...));
-int	 fs_getmntinfo __P((struct statfs **, char *, const char *));
-int	 get __P((int, off_t, void *, size_t));
-FS_INFO	*get_fs_info __P((struct statfs *, int));
-int 	 lfs_segmapv __P((FS_INFO *, int, caddr_t, BLOCK_INFO **, int *));
-int	 mmap_segment __P((FS_INFO *, int, caddr_t *, int));
-void	 munmap_segment __P((FS_INFO *, caddr_t, int));
-void	 reread_fs_info __P((FS_INFO *, int));
+int	 dump_summary(struct lfs *, SEGSUM *, u_long, daddr_t **);
+void	 err(const int, const char *, ...);
+int	 fs_getmntinfo(struct statfs **, char *, const char *);
+int	 get(int, off_t, void *, size_t);
+FS_INFO	*get_fs_info(struct statfs *, int);
+int 	 lfs_segmapv(FS_INFO *, int, caddr_t, BLOCK_INFO **, int *);
+int	 mmap_segment(FS_INFO *, int, caddr_t *, int);
+void	 munmap_segment(FS_INFO *, caddr_t, int);
+void	 reread_fs_info(FS_INFO *, int);
 void	 toss __P((void *, int *, size_t,
 	      int (*)(const void *, const void *, const void *), void *));
 
@@ -155,10 +155,10 @@ void	 toss __P((void *, int *, size_t,
 	fflush(stdout); \
 }
 
-void	 dump_super __P((struct lfs *));
-void	 dump_cleaner_info __P((void *));
-void	 print_SEGSUM __P(( struct lfs *, SEGSUM *));
-void	 print_CLEANERINFO __P((CLEANERINFO *));
+void	 dump_super(struct lfs *);
+void	 dump_cleaner_info(void *);
+void	 print_SEGSUM( struct lfs *, SEGSUM *);
+void	 print_CLEANERINFO(CLEANERINFO *);
 #else
 #define	PRINT_FINFO(fp, ip)
 #define	PRINT_INODE(b, bip)
diff --git a/libexec/lfs_cleanerd/cleanerd.c b/libexec/lfs_cleanerd/cleanerd.c
index 8b0db6d4e3f..47314cad476 100644
--- a/libexec/lfs_cleanerd/cleanerd.c
+++ b/libexec/lfs_cleanerd/cleanerd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cleanerd.c,v 1.6 2001/07/27 20:34:36 pvalchev Exp $	*/
+/*	$OpenBSD: cleanerd.c,v 1.7 2002/02/16 21:27:30 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "@(#)cleanerd.c	8.5 (Berkeley) 6/10/95";*/
-static char rcsid[] = "$OpenBSD: cleanerd.c,v 1.6 2001/07/27 20:34:36 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: cleanerd.c,v 1.7 2002/02/16 21:27:30 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -86,21 +86,21 @@ struct tossstruct {
 #define	CLEAN_BYTES	0x1
 
 /* function prototypes for system calls; not sure where they should go */
-int	 lfs_segwait __P((fsid_t *, struct timeval *));
-int	 lfs_segclean __P((fsid_t *, u_long));
-int	 lfs_bmapv __P((fsid_t *, BLOCK_INFO *, int));
-int	 lfs_markv __P((fsid_t *, BLOCK_INFO *, int));
+int	 lfs_segwait(fsid_t *, struct timeval *);
+int	 lfs_segclean(fsid_t *, u_long);
+int	 lfs_bmapv(fsid_t *, BLOCK_INFO *, int);
+int	 lfs_markv(fsid_t *, BLOCK_INFO *, int);
 
 /* function prototypes */
-int	 bi_tossold __P((const void *, const void *, const void *));
+int	 bi_tossold(const void *, const void *, const void *);
 int	 choose_segments __P((FS_INFO *, struct seglist *, 
 	     int (*)(FS_INFO *, SEGUSE *)));
 void	 clean_fs __P((FS_INFO	*, int (*)(FS_INFO *, SEGUSE *), int, long));
-int	 clean_loop __P((FS_INFO *, int, long));
-int	 clean_segment __P((FS_INFO *, int));
-int	 cost_benefit __P((FS_INFO *, SEGUSE *));
-int	 cost_compare __P((const void *, const void *));
-void	 sig_report __P((int));
+int	 clean_loop(FS_INFO *, int, long);
+int	 clean_segment(FS_INFO *, int);
+int	 cost_benefit(FS_INFO *, SEGUSE *);
+int	 cost_compare(const void *, const void *);
+void	 sig_report(int);
 
 /*
  * Cleaning Cost Functions:
@@ -308,7 +308,7 @@ clean_loop(fsp, nsegs, options)
 void
 clean_fs(fsp, cost_func, nsegs, options)
 	FS_INFO	*fsp;	/* file system information */
-	int (*cost_func) __P((FS_INFO *, SEGUSE *));
+	int (*cost_func)(FS_INFO *, SEGUSE *);
 	int nsegs;
 	long options;
 {
@@ -380,7 +380,7 @@ int
 choose_segments(fsp, seglist, cost_func)
 	FS_INFO *fsp;
 	struct seglist *seglist;
-	int (*cost_func) __P((FS_INFO *, SEGUSE *));
+	int (*cost_func)(FS_INFO *, SEGUSE *);
 {
 	struct lfs *lfsp;
 	struct seglist *sp;
diff --git a/libexec/lfs_cleanerd/library.c b/libexec/lfs_cleanerd/library.c
index cdf0bfeaa1f..9a193d9e8c2 100644
--- a/libexec/lfs_cleanerd/library.c
+++ b/libexec/lfs_cleanerd/library.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: library.c,v 1.4 2001/07/27 20:34:36 pvalchev Exp $	*/
+/*	$OpenBSD: library.c,v 1.5 2002/02/16 21:27:30 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "@(#)library.c	8.3 (Berkeley) 5/24/95";*/
-static char rcsid[] = "$OpenBSD: library.c,v 1.4 2001/07/27 20:34:36 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: library.c,v 1.5 2002/02/16 21:27:30 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -60,11 +60,11 @@ void	 add_blocks __P((FS_INFO *, BLOCK_INFO *, int *, SEGSUM *, caddr_t,
 	     daddr_t, daddr_t));
 void	 add_inodes __P((FS_INFO *, BLOCK_INFO *, int *, SEGSUM *, caddr_t,
 	     daddr_t));
-int	 bi_compare __P((const void *, const void *));
-int	 bi_toss __P((const void *, const void *, const void *));
-void	 get_ifile __P((FS_INFO *, int));
-int	 get_superblock __P((FS_INFO *, struct lfs *));
-int	 pseg_valid __P((FS_INFO *, SEGSUM *));
+int	 bi_compare(const void *, const void *);
+int	 bi_toss(const void *, const void *, const void *);
+void	 get_ifile(FS_INFO *, int);
+int	 get_superblock(FS_INFO *, struct lfs *);
+int	 pseg_valid(FS_INFO *, SEGSUM *);
 
 /*
  * This function will get information on a a filesystem which matches
@@ -674,7 +674,7 @@ toss(p, nump, size, dotoss, client)
 	void *p;
 	int *nump;
 	size_t size;
-	int (*dotoss) __P((const void *, const void *, const void *));
+	int (*dotoss)(const void *, const void *, const void *);
 	void *client;
 {
 	int i;
diff --git a/libexec/lockspool/lockspool.c b/libexec/lockspool/lockspool.c
index dc0e0d162fd..7c18f4bc46a 100644
--- a/libexec/lockspool/lockspool.c
+++ b/libexec/lockspool/lockspool.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lockspool.c,v 1.6 2001/09/05 18:53:26 millert Exp $	*/
+/*	$OpenBSD: lockspool.c,v 1.7 2002/02/16 21:27:30 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Theo de Raadt <deraadt@theos.com>
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: lockspool.c,v 1.6 2001/09/05 18:53:26 millert Exp $";
+static const char rcsid[] = "$OpenBSD: lockspool.c,v 1.7 2002/02/16 21:27:30 millert Exp $";
 #endif /* not lint */
 
 #include <sys/signal.h>
@@ -40,8 +40,8 @@ static const char rcsid[] = "$OpenBSD: lockspool.c,v 1.6 2001/09/05 18:53:26 mil
 #include <stdio.h>
 #include "mail.local.h"
 
-void unhold __P((int));
-void usage __P((void));
+void unhold(int);
+void usage(void);
 
 extern char *__progname;
 
diff --git a/libexec/login_chpass/login_chpass.c b/libexec/login_chpass/login_chpass.c
index ed31e2795ae..c05d9e036e8 100644
--- a/libexec/login_chpass/login_chpass.c
+++ b/libexec/login_chpass/login_chpass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_chpass.c,v 1.5 2002/01/06 21:53:28 millert Exp $	*/
+/*	$OpenBSD: login_chpass.c,v 1.6 2002/02/16 21:27:30 millert Exp $	*/
 
 /*-
  * Copyright (c) 1995,1996 Berkeley Software Design, Inc. All rights reserved.
@@ -76,20 +76,20 @@
 struct iovec iov[2] = { { BI_SILENT, sizeof(BI_SILENT) - 1 }, { "\n", 1 } };
 
 #ifdef  YP
-int	_yp_check __P((char **));
-char	*ypgetnewpasswd __P((struct passwd *, char **));
-struct passwd *ypgetpwnam __P((char *));
-void	kbintr __P((int));
+int	_yp_check(char **);
+char	*ypgetnewpasswd(struct passwd *, char **);
+struct passwd *ypgetpwnam(char *);
+void	kbintr(int);
 #endif
 
 #ifdef KERBEROS
-int	get_pw_new_pwd __P((char *, int, krb_principal *, int));
+int	get_pw_new_pwd(char *, int, krb_principal *, int);
 char	realm[REALM_SZ];
 #endif
 
-void	local_chpass __P((char **));
-void	krb_chpass __P((char *, char *, char **));
-void	yp_chpass __P((char *));
+void	local_chpass(char **);
+void	krb_chpass(char *, char *, char **);
+void	yp_chpass(char *);
 
 int
 main(argc, argv)
diff --git a/libexec/login_lchpass/login_lchpass.c b/libexec/login_lchpass/login_lchpass.c
index 31921d489fb..86bddeef576 100644
--- a/libexec/login_lchpass/login_lchpass.c
+++ b/libexec/login_lchpass/login_lchpass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_lchpass.c,v 1.6 2002/01/06 21:53:28 millert Exp $	*/
+/*	$OpenBSD: login_lchpass.c,v 1.7 2002/02/16 21:27:30 millert Exp $	*/
 
 /*-
  * Copyright (c) 1995,1996 Berkeley Software Design, Inc. All rights reserved.
@@ -55,7 +55,7 @@
 
 #define BACK_CHANNEL	3
 
-int local_passwd __P((char *, int));
+int local_passwd(char *, int);
 
 int
 main(argc, argv)
diff --git a/libexec/login_skey/login_skey.c b/libexec/login_skey/login_skey.c
index 7645a70b702..0219d59c167 100644
--- a/libexec/login_skey/login_skey.c
+++ b/libexec/login_skey/login_skey.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_skey.c,v 1.6 2001/12/07 05:15:58 millert Exp $	*/
+/*	$OpenBSD: login_skey.c,v 1.7 2002/02/16 21:27:30 millert Exp $	*/
 
 /*-
  * Copyright (c) 1995 Berkeley Software Design, Inc. All rights reserved.
@@ -57,8 +57,8 @@
 #include <sha1.h>
 #include <skey.h>
 
-void quit __P((int));
-void suspend __P((int));
+void quit(int);
+void suspend(int);
 
 volatile sig_atomic_t resumed;
 struct skey skey;
diff --git a/libexec/mail.local/mail.local.h b/libexec/mail.local/mail.local.h
index 4c1baab8092..1b24dfd5e95 100644
--- a/libexec/mail.local/mail.local.h
+++ b/libexec/mail.local/mail.local.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mail.local.h,v 1.2 2001/08/18 21:37:38 deraadt Exp $	*/
+/*	$OpenBSD: mail.local.h,v 1.3 2002/02/16 21:27:30 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -36,11 +36,11 @@
 #define	FATAL		1
 #define	NOTFATAL	0
 
-void	baditem	__P((char *));
-int	deliver __P((int, char *, int));
-void	merr __P((int, const char *, ...));
-int	getlock __P((char *, struct passwd *));
-void	notifybiff __P((char *));
-void	rellock __P((void));
-int	store __P((char *));
-void	usage __P((void));
+void	baditem(char *);
+int	deliver(int, char *, int);
+void	merr(int, const char *, ...);
+int	getlock(char *, struct passwd *);
+void	notifybiff(char *);
+void	rellock(void);
+int	store(char *);
+void	usage(void);
diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c
index aab2c1c2faf..0c50cf8a8b3 100644
--- a/libexec/rexecd/rexecd.c
+++ b/libexec/rexecd/rexecd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rexecd.c,v 1.18 2001/07/09 07:04:44 deraadt Exp $	*/
+/*	$OpenBSD: rexecd.c,v 1.19 2002/02/16 21:27:30 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 The Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)rexecd.c	5.12 (Berkeley) 2/25/91";*/
-static char rcsid[] = "$OpenBSD: rexecd.c,v 1.18 2001/07/09 07:04:44 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rexecd.c,v 1.19 2002/02/16 21:27:30 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -68,7 +68,7 @@ static char rcsid[] = "$OpenBSD: rexecd.c,v 1.18 2001/07/09 07:04:44 deraadt Exp
 #include <bsd_auth.h>
 
 /*VARARGS1*/
-void error __P(());
+void error();
 
 char	*remote;
 char	*envinit[1];
@@ -77,8 +77,8 @@ login_cap_t *lc;
 
 struct	sockaddr_in asin = { AF_INET };
 
-void doit __P((int, struct sockaddr_in *));
-void getstr __P((char *buf, int cnt, char *err));
+void doit(int, struct sockaddr_in *);
+void getstr(char *buf, int cnt, char *err);
 
 /*
  * remote execute server:
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index e4e50159725..7a5e77950a8 100644
--- a/libexec/rlogind/rlogind.c
+++ b/libexec/rlogind/rlogind.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rlogind.c,v 1.33 2002/02/16 19:34:45 millert Exp $	*/
+/*	$OpenBSD: rlogind.c,v 1.34 2002/02/16 21:27:31 millert Exp $	*/
 
 /*-
  * Copyright (c) 1983, 1988, 1989, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)rlogind.c	8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$OpenBSD: rlogind.c,v 1.33 2002/02/16 19:34:45 millert Exp $";
+static char *rcsid = "$OpenBSD: rlogind.c,v 1.34 2002/02/16 21:27:31 millert Exp $";
 #endif /* not lint */
 
 /*
@@ -109,18 +109,18 @@ int	check_all = 1;
 
 struct	passwd *pwd;
 
-void	doit __P((int, struct sockaddr *));
-int	control __P((int, char *, int));
-void	protocol __P((int, int));
-void	cleanup __P((int));
-void	fatal __P((int, char *, int));
-int	do_rlogin __P((struct sockaddr *));
-void	getstr __P((char *, int, char *));
-void	setup_term __P((int));
-int	do_krb_login __P((struct sockaddr_in *));
-void	usage __P((void));
-int	local_domain __P((char *));
-char	*topdomain __P((char *));
+void	doit(int, struct sockaddr *);
+int	control(int, char *, int);
+void	protocol(int, int);
+void	cleanup(int);
+void	fatal(int, char *, int);
+int	do_rlogin(struct sockaddr *);
+void	getstr(char *, int, char *);
+void	setup_term(int);
+int	do_krb_login(struct sockaddr_in *);
+void	usage(void);
+int	local_domain(char *);
+char	*topdomain(char *);
 
 int
 main(argc, argv)
diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c
index b40080848e4..581d9bc5b9b 100644
--- a/libexec/rpc.rquotad/rquotad.c
+++ b/libexec/rpc.rquotad/rquotad.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rquotad.c,v 1.10 2001/06/11 15:18:51 mickey Exp $	*/
+/*	$OpenBSD: rquotad.c,v 1.11 2002/02/16 21:27:31 millert Exp $	*/
 /*
  * by Manuel Bouyer (bouyer@ensta.fr)
  * 
@@ -29,12 +29,12 @@
 #include <rpcsvc/rquota.h>
 #include <arpa/inet.h>
 
-void rquota_service __P((struct svc_req *request, SVCXPRT *transp));
-void sendquota __P((struct svc_req *request, SVCXPRT *transp));
-void printerr_reply __P((SVCXPRT *transp));
-void initfs __P((void));
-int getfsquota __P((long id, char *path, struct dqblk *dqblk));
-int hasquota __P((struct fstab *fs, char **qfnamep));
+void rquota_service(struct svc_req *request, SVCXPRT *transp);
+void sendquota(struct svc_req *request, SVCXPRT *transp);
+void printerr_reply(SVCXPRT *transp);
+void initfs(void);
+int getfsquota(long id, char *path, struct dqblk *dqblk);
+int hasquota(struct fstab *fs, char **qfnamep);
 
 /*
  * structure containing informations about ufs filesystems
diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c
index 5d0d933230d..0ae365812eb 100644
--- a/libexec/rpc.rstatd/rstat_proc.c
+++ b/libexec/rpc.rstatd/rstat_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rstat_proc.c,v 1.20 2001/11/18 23:45:39 deraadt Exp $	*/
+/*	$OpenBSD: rstat_proc.c,v 1.21 2002/02/16 21:27:31 millert Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -31,7 +31,7 @@
 #ifndef lint
 /*static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";*/
 /*static char sccsid[] = "from: @(#)rstat_proc.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char rcsid[] = "$OpenBSD: rstat_proc.c,v 1.20 2001/11/18 23:45:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rstat_proc.c,v 1.21 2002/02/16 21:27:31 millert Exp $";
 #endif
 
 /*
@@ -298,7 +298,7 @@ rstat_service(rqstp, transp)
 	} argument;
 	char *result;
 	xdrproc_t xdr_argument, xdr_result;
-	char *(*local) __P((void *, struct svc_req *));
+	char *(*local)(void *, struct svc_req *);
 
 	switch (rqstp->rq_proc) {
 	case NULLPROC:
@@ -310,15 +310,15 @@ rstat_service(rqstp, transp)
 		xdr_result = (xdrproc_t)xdr_statstime;
 		switch (rqstp->rq_vers) {
 		case RSTATVERS_ORIG:
-			local = (char *(*) __P((void *, struct svc_req *)))
+			local = (char *(*)(void *, struct svc_req *))
 				rstatproc_stats_1_svc;
 			break;
 		case RSTATVERS_SWTCH:
-			local = (char *(*) __P((void *, struct svc_req *)))
+			local = (char *(*)(void *, struct svc_req *))
 				rstatproc_stats_2_svc;
 			break;
 		case RSTATVERS_TIME:
-			local = (char *(*) __P((void *, struct svc_req *)))
+			local = (char *(*)(void *, struct svc_req *))
 				rstatproc_stats_3_svc;
 			break;
 		default:
@@ -332,15 +332,15 @@ rstat_service(rqstp, transp)
 		xdr_result = (xdrproc_t)xdr_u_int;
 		switch (rqstp->rq_vers) {
 		case RSTATVERS_ORIG:
-			local = (char *(*) __P((void *, struct svc_req *)))
+			local = (char *(*)(void *, struct svc_req *))
 				rstatproc_havedisk_1_svc;
 			break;
 		case RSTATVERS_SWTCH:
-			local = (char *(*) __P((void *, struct svc_req *)))
+			local = (char *(*)(void *, struct svc_req *))
 				rstatproc_havedisk_2_svc;
 			break;
 		case RSTATVERS_TIME:
-			local = (char *(*) __P((void *, struct svc_req *)))
+			local = (char *(*)(void *, struct svc_req *))
 				rstatproc_havedisk_3_svc;
 			break;
 		default:
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index 98d50c61e65..56de7d78dae 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rstatd.c,v 1.7 2001/11/18 23:45:39 deraadt Exp $	*/
+/*	$OpenBSD: rstatd.c,v 1.8 2002/02/16 21:27:31 millert Exp $	*/
 
 /*-
  * Copyright (c) 1993, John Brezak
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: rstatd.c,v 1.7 2001/11/18 23:45:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rstatd.c,v 1.8 2002/02/16 21:27:31 millert Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: rstatd.c,v 1.7 2001/11/18 23:45:39 deraadt Exp
 
 extern int __svc_fdsetsize;
 extern fd_set *__svc_fdset;
-extern void svc_getreqset2 __P((fd_set *, int));
+extern void svc_getreqset2(fd_set *, int);
 extern void rstat_service(struct svc_req *, SVCXPRT *);
 
 void my_svc_run(void);
diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c
index 2198ef970fd..c2b66d6eb50 100644
--- a/libexec/rpc.rusersd/rusers_proc.c
+++ b/libexec/rpc.rusersd/rusers_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rusers_proc.c,v 1.12 2001/11/18 23:39:18 deraadt Exp $	*/
+/*	$OpenBSD: rusers_proc.c,v 1.13 2002/02/16 21:27:31 millert Exp $	*/
 
 /*-
  *  Copyright (c) 1993 John Brezak
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: rusers_proc.c,v 1.12 2001/11/18 23:39:18 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rusers_proc.c,v 1.13 2002/02/16 21:27:31 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -357,7 +357,7 @@ rusers_service(rqstp, transp)
 	} argument;
 	char *result;
 	xdrproc_t xdr_argument, xdr_result;
-	char *(*local) __P((void *, struct svc_req *));
+	char *(*local)(void *, struct svc_req *);
 
 	switch (rqstp->rq_proc) {
 	case NULLPROC:
@@ -371,7 +371,7 @@ rusers_service(rqstp, transp)
 		case RUSERSVERS_3:
 		case RUSERSVERS_IDLE:
 		case RUSERSVERS_ORIG:
-			local = (char *(*) __P((void *, struct svc_req *)))
+			local = (char *(*)(void *, struct svc_req *))
 					rusers_num_svc;
 			break;
 		default:
@@ -386,19 +386,19 @@ rusers_service(rqstp, transp)
 		xdr_result = (xdrproc_t)xdr_utmp_array;
 		switch (rqstp->rq_vers) {
 		case RUSERSVERS_3:
-			local = (char *(*) __P((void *, struct svc_req *)))
+			local = (char *(*)(void *, struct svc_req *))
 					rusersproc_names_3_svc;
 			break;
 
 		case RUSERSVERS_IDLE:
 			xdr_result = (xdrproc_t)xdr_utmpidlearr;
-			local = (char *(*) __P((void *, struct svc_req *)))
+			local = (char *(*)(void *, struct svc_req *))
 					rusersproc_names_2_svc;
 			break;
 
 		case RUSERSVERS_ORIG:
 			xdr_result = (xdrproc_t)xdr_utmpidlearr;
-			local = (char *(*) __P((void *, struct svc_req *)))
+			local = (char *(*)(void *, struct svc_req *))
 					rusersproc_names_1_svc;
 			break;
 
@@ -414,19 +414,19 @@ rusers_service(rqstp, transp)
 		xdr_result = (xdrproc_t)xdr_utmp_array;
 		switch (rqstp->rq_vers) {
 		case RUSERSVERS_3:
-			local = (char *(*) __P((void *, struct svc_req *)))
+			local = (char *(*)(void *, struct svc_req *))
 					rusersproc_allnames_3_svc;
 			break;
 
 		case RUSERSVERS_IDLE:
 			xdr_result = (xdrproc_t)xdr_utmpidlearr;
-			local = (char *(*) __P((void *, struct svc_req *)))
+			local = (char *(*)(void *, struct svc_req *))
 					rusersproc_allnames_2_svc;
 			break;
 
 		case RUSERSVERS_ORIG:
 			xdr_result = (xdrproc_t)xdr_utmpidlearr;
-			local = (char *(*) __P((void *, struct svc_req *)))
+			local = (char *(*)(void *, struct svc_req *))
 					rusersproc_allnames_1_svc;
 			break;
 
diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c
index b43dfc79136..6d145b8a717 100644
--- a/libexec/rpc.rwalld/rwalld.c
+++ b/libexec/rpc.rwalld/rwalld.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rwalld.c,v 1.5 2001/07/08 21:18:11 deraadt Exp $	*/
+/*	$OpenBSD: rwalld.c,v 1.6 2002/02/16 21:27:31 millert Exp $	*/
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
@@ -30,7 +30,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: rwalld.c,v 1.5 2001/07/08 21:18:11 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rwalld.c,v 1.6 2002/02/16 21:27:31 millert Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -151,7 +151,7 @@ wallprog_1(rqstp, transp)
 	} argument;
 	char *result;
 	xdrproc_t xdr_argument, xdr_result;
-	char *(*local) __P((char **, struct svc_req *));
+	char *(*local)(char **, struct svc_req *);
 
 	switch (rqstp->rq_proc) {
 	case NULLPROC:
@@ -161,7 +161,7 @@ wallprog_1(rqstp, transp)
 	case WALLPROC_WALL:
 		xdr_argument = (xdrproc_t)xdr_wrapstring;
 		xdr_result = (xdrproc_t)xdr_void;
-		local = (char *(*) __P((char **, struct svc_req *)))
+		local = (char *(*)(char **, struct svc_req *))
 			wallproc_wall_1_svc;
 		break;
 
diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c
index 8b31a8c97cf..83d5d545d58 100644
--- a/libexec/rpc.sprayd/sprayd.c
+++ b/libexec/rpc.sprayd/sprayd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sprayd.c,v 1.4 2001/07/08 21:18:11 deraadt Exp $*/
+/*	$OpenBSD: sprayd.c,v 1.5 2002/02/16 21:27:31 millert Exp $*/
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: sprayd.c,v 1.4 2001/07/08 21:18:11 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sprayd.c,v 1.5 2002/02/16 21:27:31 millert Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -46,7 +46,7 @@ static char rcsid[] = "$OpenBSD: sprayd.c,v 1.4 2001/07/08 21:18:11 deraadt Exp
 #include <rpc/rpc.h>
 #include <rpcsvc/spray.h>
 
-static void spray_service __P((struct svc_req *, SVCXPRT *));
+static void spray_service(struct svc_req *, SVCXPRT *);
 
 static int from_inetd = 1;
 
diff --git a/libexec/rpc.yppasswdd/yppasswdd_proc.c b/libexec/rpc.yppasswdd/yppasswdd_proc.c
index bdac32bd040..702d9b13c0c 100644
--- a/libexec/rpc.yppasswdd/yppasswdd_proc.c
+++ b/libexec/rpc.yppasswdd/yppasswdd_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppasswdd_proc.c,v 1.6 2001/12/09 14:58:30 miod Exp $	*/
+/*	$OpenBSD: yppasswdd_proc.c,v 1.7 2002/02/16 21:27:31 millert Exp $	*/
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: yppasswdd_proc.c,v 1.6 2001/12/09 14:58:30 miod Exp $";
+static char rcsid[] = "$OpenBSD: yppasswdd_proc.c,v 1.7 2002/02/16 21:27:31 millert Exp $";
 #endif
 
 #include <sys/types.h>
@@ -43,7 +43,7 @@ static char rcsid[] = "$OpenBSD: yppasswdd_proc.c,v 1.6 2001/12/09 14:58:30 miod
 
 #include "yppasswd.h"
 
-int make_passwd __P((yppasswd *));
+int make_passwd(yppasswd *);
 
 int *
 yppasswdproc_update_1_svc(argp, rqstp, transp)
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index 697b7cc4452..300071025eb 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rshd.c,v 1.40 2001/09/05 22:32:36 deraadt Exp $	*/
+/*	$OpenBSD: rshd.c,v 1.41 2002/02/16 21:27:31 millert Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1989, 1992, 1993, 1994
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)rshd.c	8.2 (Berkeley) 4/6/94"; */
-static char *rcsid = "$OpenBSD: rshd.c,v 1.40 2001/09/05 22:32:36 deraadt Exp $";
+static char *rcsid = "$OpenBSD: rshd.c,v 1.41 2002/02/16 21:27:31 millert Exp $";
 #endif /* not lint */
 
 /*
@@ -84,12 +84,12 @@ int	log_success;		/* If TRUE, log all successful accesses */
 int	sent_null;
 login_cap_t *lc;
 
-void	 doit __P((struct sockaddr *));
-void	 error __P((const char *, ...));
-void	 getstr __P((char *, int, char *));
-int	 local_domain __P((char *));
-char	*topdomain __P((char *));
-void	 usage __P((void));
+void	 doit(struct sockaddr *);
+void	 error(const char *, ...);
+void	 getstr(char *, int, char *);
+int	 local_domain(char *);
+char	*topdomain(char *);
+void	 usage(void);
 
 #ifdef	KERBEROS
 #include <des.h>
@@ -108,10 +108,10 @@ char	tickbuf[sizeof(KTEXT_ST)];
 int	doencrypt, use_kerberos, vacuous;
 des_key_schedule schedule;
 #ifdef CRYPT
-int des_read __P((int, char *, int));
-int des_write __P((int, char *, int));
-void desrw_clear_key __P(());
-void desrw_set_key __P((des_cblock *, des_key_schedule *));
+int des_read(int, char *, int);
+int des_write(int, char *, int);
+void desrw_clear_key();
+void desrw_set_key(des_cblock *, des_key_schedule *);
 #endif
 #else
 #define	OPTIONS	"alnL"
diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c
index 432d6a1ecfa..0c60261a74d 100644
--- a/libexec/talkd/announce.c
+++ b/libexec/talkd/announce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: announce.c,v 1.11 2001/07/08 21:18:12 deraadt Exp $	*/
+/*	$OpenBSD: announce.c,v 1.12 2002/02/16 21:27:31 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)announce.c	5.9 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: announce.c,v 1.11 2001/07/08 21:18:12 deraadt Exp $";
+static char rcsid[] = "$Id: announce.c,v 1.12 2002/02/16 21:27:31 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -55,7 +55,7 @@ static char rcsid[] = "$Id: announce.c,v 1.11 2001/07/08 21:18:12 deraadt Exp $"
 #include <paths.h>
 #include "talkd.h"
 
-static void	print_mesg __P((FILE *,CTL_MSG *,char *));
+static void	print_mesg(FILE *,CTL_MSG *,char *);
 
 /*
  * Announce an invitation to talk.  If the user is
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index 71c37df30fb..14925978567 100644
--- a/libexec/talkd/table.c
+++ b/libexec/talkd/table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: table.c,v 1.7 2001/12/07 18:45:33 mpech Exp $	*/
+/*	$OpenBSD: table.c,v 1.8 2002/02/16 21:27:31 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)table.c	5.7 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: table.c,v 1.7 2001/12/07 18:45:33 mpech Exp $";
+static char rcsid[] = "$Id: table.c,v 1.8 2002/02/16 21:27:31 millert Exp $";
 #endif /* not lint */
 
 /*
@@ -72,7 +72,7 @@ struct table_entry {
 };
 TAILQ_HEAD(, table_entry)	table;
 
-static void	delete __P((TABLE_ENTRY *));
+static void	delete(TABLE_ENTRY *);
 
 /*
  * Init the table
diff --git a/libexec/talkd/talkd.h b/libexec/talkd/talkd.h
index 5ace0fbfbfb..bf25785b5c9 100644
--- a/libexec/talkd/talkd.h
+++ b/libexec/talkd/talkd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: talkd.h,v 1.4 2001/12/07 18:45:33 mpech Exp $	*/
+/*	$OpenBSD: talkd.h,v 1.5 2002/02/16 21:27:31 millert Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -38,22 +38,22 @@ extern int	debug;
 extern char	hostname[];
 
 /* table.c */
-void	init_table __P((void));
-CTL_MSG *find_request __P((CTL_MSG *));
-CTL_MSG *find_match __P((CTL_MSG *));
-void	insert_table __P((CTL_MSG *, CTL_RESPONSE *));
-int	new_id __P((void));
-int	delete_invite __P((int));
+void	init_table(void);
+CTL_MSG *find_request(CTL_MSG *);
+CTL_MSG *find_match(CTL_MSG *);
+void	insert_table(CTL_MSG *, CTL_RESPONSE *);
+int	new_id(void);
+int	delete_invite(int);
 
 /* process.c */
-void	process_request __P(( CTL_MSG *, CTL_RESPONSE *));
-void	do_announce __P((CTL_MSG *, CTL_RESPONSE *));
-int	find_user __P((char *name, char *tty));
+void	process_request( CTL_MSG *, CTL_RESPONSE *);
+void	do_announce(CTL_MSG *, CTL_RESPONSE *);
+int	find_user(char *name, char *tty);
 
 /* announce.c */
-int	announce __P((CTL_MSG *,char *));
+int	announce(CTL_MSG *,char *);
 
 /* print.c */
-void	print_request __P((char *,CTL_MSG *));
-void	print_response __P((char *,CTL_RESPONSE *));
+void	print_request(char *,CTL_MSG *);
+void	print_response(char *,CTL_RESPONSE *);
 
diff --git a/libexec/tcpd/safe_finger/safe_finger.c b/libexec/tcpd/safe_finger/safe_finger.c
index f05d11507b7..0b8692dded9 100644
--- a/libexec/tcpd/safe_finger/safe_finger.c
+++ b/libexec/tcpd/safe_finger/safe_finger.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: safe_finger.c,v 1.2 2001/01/17 19:24:28 deraadt Exp $	*/
+/*	$OpenBSD: safe_finger.c,v 1.3 2002/02/16 21:27:31 millert Exp $	*/
 
  /*
   * safe_finger - finger client wrapper that protects against nasty stuff
@@ -20,7 +20,7 @@
 #if 0
 static char sccsid[] = "@(#) safe_finger.c 1.4 94/12/28 17:42:41";
 #else
-static char rcsid[] = "$OpenBSD: safe_finger.c,v 1.2 2001/01/17 19:24:28 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: safe_finger.c,v 1.3 2002/02/16 21:27:31 millert Exp $";
 #endif
 #endif
 
@@ -50,7 +50,7 @@ char    path[] = "PATH=/bin:/usr/bin:/usr/sbin:/sbin";
 
 int     finger_pid;
 
-int	pipe_stdin __P((char **));
+int	pipe_stdin(char **);
 
 void    cleanup(sig)
 int     sig;
diff --git a/libexec/tcpd/tcpdchk/inetcf.h b/libexec/tcpd/tcpdchk/inetcf.h
index c07ef60ecac..05716c3509e 100644
--- a/libexec/tcpd/tcpdchk/inetcf.h
+++ b/libexec/tcpd/tcpdchk/inetcf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inetcf.h,v 1.1 1997/02/26 06:17:07 downsj Exp $	*/
+/*	$OpenBSD: inetcf.h,v 1.2 2002/02/16 21:27:31 millert Exp $	*/
 
  /*
   * @(#) inetcf.h 1.1 94/12/28 17:42:30
@@ -8,9 +8,9 @@
 
 #include <sys/cdefs.h>
 
-extern char *inet_cfg __P((char *));
-extern void inet_set __P((char *, int));
-extern int inet_get __P((char *));
+extern char *inet_cfg(char *);
+extern void inet_set(char *, int);
+extern int inet_get(char *);
 
 #define WR_UNKNOWN	(-1)		/* service unknown */
 #define WR_NOT		1		/* may not be wrapped */
diff --git a/libexec/tcpd/tcpdchk/scaffold.h b/libexec/tcpd/tcpdchk/scaffold.h
index ca845c11e44..2450d24ca10 100644
--- a/libexec/tcpd/tcpdchk/scaffold.h
+++ b/libexec/tcpd/tcpdchk/scaffold.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scaffold.h,v 1.1 1997/02/26 06:17:08 downsj Exp $	*/
+/*	$OpenBSD: scaffold.h,v 1.2 2002/02/16 21:27:31 millert Exp $	*/
 
  /*
   * @(#) scaffold.h 1.3 94/12/31 18:19:19
@@ -9,7 +9,7 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-extern struct hostent *find_inet_addr __P((char *));
-extern int check_dns __P((char *));
-extern int check_path __P((char *, struct stat *));
+extern struct hostent *find_inet_addr(char *);
+extern int check_dns(char *);
+extern int check_path(char *, struct stat *);
 __END_DECLS
diff --git a/libexec/uucpd/uucpd.c b/libexec/uucpd/uucpd.c
index 41ac4a62ab0..55935abda13 100644
--- a/libexec/uucpd/uucpd.c
+++ b/libexec/uucpd/uucpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uucpd.c,v 1.20 2001/12/07 18:45:33 mpech Exp $	*/
+/*	$OpenBSD: uucpd.c,v 1.21 2002/02/16 21:27:31 millert Exp $	*/
 
 /*
  * Copyright (c) 1985 The Regents of the University of California.
@@ -44,7 +44,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)uucpd.c	5.10 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$OpenBSD: uucpd.c,v 1.20 2001/12/07 18:45:33 mpech Exp $";
+static char rcsid[] = "$OpenBSD: uucpd.c,v 1.21 2002/02/16 21:27:31 millert Exp $";
 #endif /* not lint */
 
 /*
@@ -73,10 +73,10 @@ static char rcsid[] = "$OpenBSD: uucpd.c,v 1.20 2001/12/07 18:45:33 mpech Exp $"
 #include <fcntl.h>
 #include "pathnames.h"
 
-void doit __P((struct sockaddr_in *));
-int readline __P((char *, int n));
-void dologout __P((void));
-void dologin __P((struct passwd *, struct sockaddr_in *));
+void doit(struct sockaddr_in *);
+int readline(char *, int n);
+void dologout(void);
+void dologin(struct passwd *, struct sockaddr_in *);
 
 struct	sockaddr_in hisctladdr;
 int hisaddrlen = sizeof hisctladdr;