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.

15 files changed, 237 insertions, 237 deletions

diff --git a/usr.bin/sup/src/errmsg.c b/usr.bin/sup/src/errmsg.c
index 52b611acefd..94a73263b8b 100644
--- a/usr.bin/sup/src/errmsg.c
+++ b/usr.bin/sup/src/errmsg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: errmsg.c,v 1.7 2001/05/04 22:16:15 millert Exp $	*/
+/*	$OpenBSD: errmsg.c,v 1.8 2002/02/16 21:27:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1991 Carnegie Mellon University
@@ -37,7 +37,7 @@
 #include "supextern.h"
 
 #ifndef HAS_STRERROR
-static char *itoa __P((char *, unsigned int));
+static char *itoa(char *, unsigned int);
 
 static char *itoa(p, n)
 	char *p;
diff --git a/usr.bin/sup/src/expand.c b/usr.bin/sup/src/expand.c
index 798052f96b9..82e93d67310 100644
--- a/usr.bin/sup/src/expand.c
+++ b/usr.bin/sup/src/expand.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: expand.c,v 1.11 2001/05/05 15:56:04 millert Exp $	*/
+/*	$OpenBSD: expand.c,v 1.12 2002/02/16 21:27:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1991 Carnegie Mellon University
@@ -97,15 +97,15 @@ static	int	bufcnt;			/* current number in buffer */
 #endif
 #endif
 
-int expand __P((char *, char **, int));
-static void glob __P((char *));
-static void matchdir __P((char *));
-static int execbrc __P((char *, char *));
-static int match __P((char *, char *));
-static int amatch __P((char *, char *));
-static void addone __P((char *, char *));
-static int addpath __P((int));
-static int gethdir __P((char *, int));
+int expand(char *, char **, int);
+static void glob(char *);
+static void matchdir(char *);
+static int execbrc(char *, char *);
+static int match(char *, char *);
+static int amatch(char *, char *);
+static void addone(char *, char *);
+static int addpath(int);
+static int gethdir(char *, int);
 
 int
 expand(spec, buffer, bufsize)
diff --git a/usr.bin/sup/src/run.c b/usr.bin/sup/src/run.c
index 48adefb7fb5..63113d3c71f 100644
--- a/usr.bin/sup/src/run.c
+++ b/usr.bin/sup/src/run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: run.c,v 1.10 2001/07/25 16:54:11 deraadt Exp $	*/
+/*	$OpenBSD: run.c,v 1.11 2002/02/16 21:27:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1991 Carnegie Mellon University
@@ -101,8 +101,8 @@
 #endif
 #endif
 
-static int dorun __P((char *, char **, int));
-static char **makearglist __P((va_list));
+static int dorun(char *, char **, int);
+static char **makearglist(va_list);
 
 static char **
 makearglist(ap)
diff --git a/usr.bin/sup/src/scan.c b/usr.bin/sup/src/scan.c
index 8439a338a20..f69c92e6c63 100644
--- a/usr.bin/sup/src/scan.c
+++ b/usr.bin/sup/src/scan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scan.c,v 1.12 2001/05/04 22:16:16 millert Exp $	*/
+/*	$OpenBSD: scan.c,v 1.13 2002/02/16 21:27:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -176,25 +176,25 @@ extern int candorcs;
 /*************************************************
  ***   STATIC   R O U T I N E S    ***
  *************************************************/
-static void passdelim __P((char **, int ));
-static char *parserelease __P((TREELIST **, char *, char *));
-static int scanone __P((TREE *, void *));
-static void makescan __P((char *, char *));
-static void getscan __P((char *, char *));
-static void doscan __P((char *));
-static void readlistfile __P((char *));
-static void expTinsert __P((char *, TREE **, int, char *));
-static int listone __P((TREE *, void *));
-static void listentry __P((char *, char *, char *, int));
-static void listname __P((char *, struct stat *));
-static void listdir __P((char *, int));
-static int omitanyone __P((TREE *, void *));
-static int anyglob __P((char *, char *));
-static int getscanfile __P((char *));
-static void chkscanfile __P((char *));
-static void makescanfile __P((char *));
-static int recordone __P((TREE *, void *));
-static int recordexec __P((TREE *, void *));
+static void passdelim(char **, int );
+static char *parserelease(TREELIST **, char *, char *);
+static int scanone(TREE *, void *);
+static void makescan(char *, char *);
+static void getscan(char *, char *);
+static void doscan(char *);
+static void readlistfile(char *);
+static void expTinsert(char *, TREE **, int, char *);
+static int listone(TREE *, void *);
+static void listentry(char *, char *, char *, int);
+static void listname(char *, struct stat *);
+static void listdir(char *, int);
+static int omitanyone(TREE *, void *);
+static int anyglob(char *, char *);
+static int getscanfile(char *);
+static void chkscanfile(char *);
+static void makescanfile(char *);
+static int recordone(TREE *, void *);
+static int recordexec(TREE *, void *);
 
 
 /*************************************************
diff --git a/usr.bin/sup/src/scm.c b/usr.bin/sup/src/scm.c
index 6e5d108074f..c1b8702b573 100644
--- a/usr.bin/sup/src/scm.c
+++ b/usr.bin/sup/src/scm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scm.c,v 1.13 2001/05/05 15:56:04 millert Exp $	*/
+/*	$OpenBSD: scm.c,v 1.14 2002/02/16 21:27:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -217,7 +217,7 @@ static char *remotename = NULL;		/* remote host name */
 static int swapmode;			/* byte-swapping needed on server? */
 
 
-static char *myhost __P((void));
+static char *myhost(void);
 
 /***************************************************
  ***    C O N N E C T I O N   R O U T I N E S    ***
diff --git a/usr.bin/sup/src/scmio.c b/usr.bin/sup/src/scmio.c
index 6c1ae8afe69..cf37d40b1db 100644
--- a/usr.bin/sup/src/scmio.c
+++ b/usr.bin/sup/src/scmio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scmio.c,v 1.10 2001/05/15 15:31:09 millert Exp $	*/
+/*	$OpenBSD: scmio.c,v 1.11 2002/02/16 21:27:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -197,10 +197,10 @@ struct buf {
 } buffers[2];
 struct buf *bufptr;			/* buffer pointer */
 
-static int writedata __P((int, char *));
-static int writeblock __P((int, char *));
-static int readdata __P((int, char *));
-static int readcount __P((int *));
+static int writedata(int, char *);
+static int writeblock(int, char *);
+static int readdata(int, char *);
+static int readcount(int *);
 
 
 /***********************************************
diff --git a/usr.bin/sup/src/stree.c b/usr.bin/sup/src/stree.c
index 11e088261c1..bb9958eb4c9 100644
--- a/usr.bin/sup/src/stree.c
+++ b/usr.bin/sup/src/stree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stree.c,v 1.8 2001/05/04 22:16:16 millert Exp $	*/
+/*	$OpenBSD: stree.c,v 1.9 2002/02/16 21:27:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -60,15 +60,15 @@
 
 #define Static		static		/* comment for debugging */
 
-Static TREE *Tmake __P((char *));
-Static TREE *Trotll __P((TREE *, TREE *));
-Static TREE *Trotlh __P((TREE *, TREE *));
-Static TREE *Trothl __P((TREE *, TREE *));
-Static TREE *Trothh __P((TREE *, TREE *));
-Static void Tbalance __P((TREE **));
-Static TREE *Tinsertavl __P((TREE **, char *, int, int *));
+Static TREE *Tmake(char *);
+Static TREE *Trotll(TREE *, TREE *);
+Static TREE *Trotlh(TREE *, TREE *);
+Static TREE *Trothl(TREE *, TREE *);
+Static TREE *Trothh(TREE *, TREE *);
+Static void Tbalance(TREE **);
+Static TREE *Tinsertavl(TREE **, char *, int, int *);
 Static int Tsubprocess __P((TREE *, int, int (*f )(TREE *, void *), void *));
-Static int Tprintone __P((TREE *, void *));
+Static int Tprintone(TREE *, void *);
 
 
 /*************************************************************
@@ -322,7 +322,7 @@ Static int
 Tsubprocess (t, reverse, f, argp)
 	TREE *t;
 	int reverse;
-	int (*f) __P((TREE *, void *));
+	int (*f)(TREE *, void *);
 	void *argp;
 {
 	int x = SCMOK;
@@ -346,7 +346,7 @@ Tsubprocess (t, reverse, f, argp)
 int
 Trprocess(t, f, args)
 	TREE *t;
-	int (*f) __P((TREE *, void *));
+	int (*f)(TREE *, void *);
 	void *args;
 {
 	if (t == NULL)
@@ -359,7 +359,7 @@ Trprocess(t, f, args)
 int
 Tprocess(t, f, args)
 	TREE *t;
-	int (*f) __P((TREE *, void *));
+	int (*f)(TREE *, void *);
 	void *args;
 {
 	if (t == NULL)
diff --git a/usr.bin/sup/src/supcmain.c b/usr.bin/sup/src/supcmain.c
index 50a64503b48..227bcec87b4 100644
--- a/usr.bin/sup/src/supcmain.c
+++ b/usr.bin/sup/src/supcmain.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supcmain.c,v 1.12 2001/09/19 10:58:07 mpech Exp $	*/
+/*	$OpenBSD: supcmain.c,v 1.13 2002/02/16 21:27:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -346,10 +346,10 @@ int rpauseflag;				/* don't disable resource pausing */
 int xpatchflag;				/* crosspatched with remote system */
 int portdebug;				/* network debugging ports */
 
-int main __P((int, char **));
-static int checkcoll __P((TREE *, void *));
-static void doswitch __P((char *, TREE **, int *, int *));
-static char *init __P((int, char **));
+int main(int, char **);
+static int checkcoll(TREE *, void *);
+static void doswitch(char *, TREE **, int *, int *);
+static char *init(int, char **);
 
 /*************************************
  ***    M A I N   R O U T I N E    ***
diff --git a/usr.bin/sup/src/supcmeat.c b/usr.bin/sup/src/supcmeat.c
index 5540baeb9ae..63b80e153b5 100644
--- a/usr.bin/sup/src/supcmeat.c
+++ b/usr.bin/sup/src/supcmeat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supcmeat.c,v 1.14 2001/05/04 22:16:16 millert Exp $	*/
+/*	$OpenBSD: supcmeat.c,v 1.15 2002/02/16 21:27:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -133,13 +133,13 @@ extern int noutime;			/* don't set utimes */
  ***    U P G R A D E   C O L L E C T I O N    ***
  *************************************************/
 
-static int needone __P((TREE *, void *));
-static int recvone __P((TREE *, va_list));
-static int denyone __P((TREE *, void *));
-static int deleteone __P((TREE *, void *));
-static int linkone __P((TREE *, void *));
-static int execone __P((TREE *, void *));
-static int finishone __P((TREE *, void *));
+static int needone(TREE *, void *);
+static int recvone(TREE *, va_list);
+static int denyone(TREE *, void *);
+static int deleteone(TREE *, void *);
+static int linkone(TREE *, void *);
+static int execone(TREE *, void *);
+static int finishone(TREE *, void *);
 
 
 /*
diff --git a/usr.bin/sup/src/supcmisc.c b/usr.bin/sup/src/supcmisc.c
index dd8bdbdc466..ebafbc7979e 100644
--- a/usr.bin/sup/src/supcmisc.c
+++ b/usr.bin/sup/src/supcmisc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supcmisc.c,v 1.11 2001/05/07 02:08:02 millert Exp $	*/
+/*	$OpenBSD: supcmisc.c,v 1.12 2002/02/16 21:27:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -73,9 +73,9 @@ static LIST *gidL[LISTSIZE];
 
 extern COLLECTION *thisC;		/* collection list pointer */
 
-static int Lhash __P((char *));
-static void Linsert __P((LIST **, char *, int));
-static LIST *Llookup __P((LIST **, char *));
+static int Lhash(char *);
+static void Linsert(LIST **, char *, int);
+static LIST *Llookup(LIST **, char *);
 
 /*************************************************
  ***    P R I N T   U P D A T E   T I M E S    ***
diff --git a/usr.bin/sup/src/supcparse.c b/usr.bin/sup/src/supcparse.c
index f8676b2c7c3..c4ec08fd8b6 100644
--- a/usr.bin/sup/src/supcparse.c
+++ b/usr.bin/sup/src/supcparse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supcparse.c,v 1.7 2001/05/04 22:16:16 millert Exp $	*/
+/*	$OpenBSD: supcparse.c,v 1.8 2002/02/16 21:27:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -99,7 +99,7 @@ struct option {
  	{ "compress", 	OCOMPRESS }
 };
 
-static void passdelim __P((char **, int ));
+static void passdelim(char **, int );
 
 static void
 passdelim(ptr, delim)		/* skip over delimiter */
diff --git a/usr.bin/sup/src/supextern.h b/usr.bin/sup/src/supextern.h
index 662deeb7960..b2e234e8fa4 100644
--- a/usr.bin/sup/src/supextern.h
+++ b/usr.bin/sup/src/supextern.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: supextern.h,v 1.5 2001/05/05 15:56:04 millert Exp $  */
+/*     $OpenBSD: supextern.h,v 1.6 2002/02/16 21:27:54 millert Exp $  */
 
 #ifndef __P
 #ifdef __STDC__
@@ -9,181 +9,181 @@
 #endif
 
 /* atoo.c */
-unsigned int atoo __P((char *));
+unsigned int atoo(char *);
 
 #if 0
 /* ci.c */
-int ci __P((char *, FILE *, int, CIENTRY *, char *, char *));
+int ci(char *, FILE *, int, CIENTRY *, char *, char *);
 #endif
 
 /* errmsg.c */
-const char *errmsg __P((int));
+const char *errmsg(int);
 
 /* expand.c */
-int expand __P((char *, char **, int));
+int expand(char *, char **, int);
 
 /* ffilecopy.c */
-int ffilecopy __P((FILE *, FILE *));
+int ffilecopy(FILE *, FILE *);
 
 /* filecopy.c */
-int filecopy __P((int, int ));
+int filecopy(int, int );
 
 /* log.c */
-void logopen __P((char *));
-void logquit __P((int, char *, ...));
-void logerr __P((char *, ...));
-void loginfo __P((char *, ...));
+void logopen(char *);
+void logquit(int, char *, ...);
+void logerr(char *, ...);
+void loginfo(char *, ...);
 #ifdef LIBWRAP
-void logdeny __P((char *, ...));
-void logallow __P((char *, ...));
+void logdeny(char *, ...);
+void logallow(char *, ...);
 #endif
 
 /* netcryptvoid.c */
-int netcrypt __P((char *));
-int getcryptbuf __P((int));
-void decode __P((char *, char *, int));
-void encode __P((char *, char *, int));
+int netcrypt(char *);
+int getcryptbuf(int);
+void decode(char *, char *, int);
+void encode(char *, char *, int);
 
 /* nxtarg.c */
-char *nxtarg __P((char **, char *));
+char *nxtarg(char **, char *);
 
 /* path.c */
-void path __P((char *, char *, char *, int));
+void path(char *, char *, char *, int);
 
 /* quit.c */
-void quit __P((int, char *, ...));
+void quit(int, char *, ...);
 
 /* read_line.c */
-char *read_line __P((FILE *, size_t *, size_t *, const char[3], int));
+char *read_line(FILE *, size_t *, size_t *, const char[3], int);
 
 /* run.c */
-int run __P((char *, ...));
-int runv __P((char *, char **));
-int runp __P((char *, ...));
-int runvp __P((char *, char **));
-int runio __P((char *const[], const char *, const char *, const char *));
-int runiofd __P((char *const[], const int, const int, const int));
+int run(char *, ...);
+int runv(char *, char **);
+int runp(char *, ...);
+int runvp(char *, char **);
+int runio(char *const[], const char *, const char *, const char *);
+int runiofd(char *const[], const int, const int, const int);
 
 /* scan.c */
-int getrelease __P((char *));
-void makescanlists __P((void));
-void getscanlists __P((void));
-void cdprefix __P((char *));
+int getrelease(char *);
+void makescanlists(void);
+void getscanlists(void);
+void cdprefix(char *);
 
 /* scm.c */
-int lock_host_file __P((char *));
-int servicesetup __P((char *));
-int service __P((void));
-int serviceprep __P((void));
-int servicekill __P((void));
-int serviceend __P((void));
-int dobackoff __P((int *, int *));
-int request __P((char *, char *, int *));
-int requestend __P((void));
-char *remotehost __P((void));
-int thishost __P((char *));
-int samehost __P((void));
-int matchhost __P((char *));
-int scmerr __P((int, char *, ...));
-int byteswap __P((int));
+int lock_host_file(char *);
+int servicesetup(char *);
+int service(void);
+int serviceprep(void);
+int servicekill(void);
+int serviceend(void);
+int dobackoff(int *, int *);
+int request(char *, char *, int *);
+int requestend(void);
+char *remotehost(void);
+int thishost(char *);
+int samehost(void);
+int matchhost(char *);
+int scmerr(int, char *, ...);
+int byteswap(int);
 
 /* scmio.c */
-int writemsg __P((int));
-int writemend __P((void));
-int writeint __P((int));
-int writestring __P((char *));
-int writefile __P((int));
-int writemnull __P((int));
-int writemint __P((int, int ));
-int writemstr __P((int, char *));
-int prereadcount __P((int *));
-int readflush __P((void));
-int readmsg __P((int));
-int readmend __P((void));
-int readskip __P((void));
-int readint __P((int *));
-int readstring __P((char **));
-int readfile __P((int));
-int readmnull __P((int));
-int readmint __P((int, int *));
-int readmstr __P((int, char **));
-void crosspatch __P((void));
+int writemsg(int);
+int writemend(void);
+int writeint(int);
+int writestring(char *);
+int writefile(int);
+int writemnull(int);
+int writemint(int, int );
+int writemstr(int, char *);
+int prereadcount(int *);
+int readflush(void);
+int readmsg(int);
+int readmend(void);
+int readskip(void);
+int readint(int *);
+int readstring(char **);
+int readfile(int);
+int readmnull(int);
+int readmint(int, int *);
+int readmstr(int, char **);
+void crosspatch(void);
 
 /* skipto.c */
-char *skipto __P((char *, char *));
-char *skipover __P((char *, char *));
+char *skipto(char *, char *);
+char *skipover(char *, char *);
 
 /* stree.c */
-void Tfree __P((TREE **));
-TREE *Tinsert __P((TREE **, char *, int));
-TREE *Tsearch __P((TREE *, char *));
-TREE *Tlookup __P((TREE *, char *));
+void Tfree(TREE **);
+TREE *Tinsert(TREE **, char *, int);
+TREE *Tsearch(TREE *, char *);
+TREE *Tlookup(TREE *, char *);
 int Trprocess __P((TREE *, int (*)(TREE *, void *), void *));
 int Tprocess __P((TREE *, int (*)(TREE *, void *), void *));
-void Tprint __P((TREE *, char *));
+void Tprint(TREE *, char *);
 
 /* supcmeat.c */
-int getonehost __P((TREE *, void *));
-TREE *getcollhost __P((int *, int *, long *, int *));
-void getcoll __P((void));
-int signon __P((TREE *, int, int *));
-int setup __P((TREE *));
-void suplogin __P((void));
-void listfiles __P((void));
-void recvfiles __P((void));
-int prepare __P((char *, int, int *, struct stat *));
-int recvdir __P((TREE *, int, struct stat *));
-int recvsym __P((TREE *, int, struct stat *));
-int recvreg __P((TREE *, int, struct stat *));
-int copyfile __P((char *, char *));
-void finishup __P((int));
-void done __P((int, char *, ...));
-void goaway __P((char *, ...));
+int getonehost(TREE *, void *);
+TREE *getcollhost(int *, int *, long *, int *);
+void getcoll(void);
+int signon(TREE *, int, int *);
+int setup(TREE *);
+void suplogin(void);
+void listfiles(void);
+void recvfiles(void);
+int prepare(char *, int, int *, struct stat *);
+int recvdir(TREE *, int, struct stat *);
+int recvsym(TREE *, int, struct stat *);
+int recvreg(TREE *, int, struct stat *);
+int copyfile(char *, char *);
+void finishup(int);
+void done(int, char *, ...);
+void goaway(char *, ...);
 
 /* supcmisc.c */
-void prtime __P((void));
-int establishdir __P((char *));
-int makedir __P((char *, int, struct stat *));
-int estabd __P((char *, char *));
-void ugconvert __P((char *, char *, uid_t *, gid_t *, int *));
-void notify __P((char *, ...));
-void lockout __P((int));
-char *fmttime __P((time_t));
+void prtime(void);
+int establishdir(char *);
+int makedir(char *, int, struct stat *);
+int estabd(char *, char *);
+void ugconvert(char *, char *, uid_t *, gid_t *, int *);
+void notify(char *, ...);
+void lockout(int);
+char *fmttime(time_t);
 
 /* supcname.c */
-void getnams __P((void));
+void getnams(void);
 
 /* supcparse.c */
-int parsecoll __P((COLLECTION *, char *, char *));
-time_t getwhen __P((char *, char *));
-int putwhen __P((char *, time_t));
+int parsecoll(COLLECTION *, char *, char *);
+time_t getwhen(char *, char *);
+int putwhen(char *, time_t);
 
 /* supmsg.c */
-int msgsignon __P((void));
-int msgsignonack __P((void));
-int msgsetup __P((void));
-int msgsetupack __P((void));
-int msgcrypt __P((void));
-int msgcryptok __P((void));
-int msglogin __P((void));
-int msglogack __P((void));
-int msgrefuse __P((void));
-int msglist __P((void));
-int msgneed __P((void));
-int msgdeny __P((void));
-int msgsend __P((void));
+int msgsignon(void);
+int msgsignonack(void);
+int msgsetup(void);
+int msgsetupack(void);
+int msgcrypt(void);
+int msgcryptok(void);
+int msglogin(void);
+int msglogack(void);
+int msgrefuse(void);
+int msglist(void);
+int msgneed(void);
+int msgdeny(void);
+int msgsend(void);
 int msgrecv __P((int (*)(TREE *, va_list), ...));
-int msgdone __P((void));
-int msggoaway __P((void));
-int msgxpatch __P((void));
-int msgcompress __P((void));
+int msgdone(void);
+int msggoaway(void);
+int msgxpatch(void);
+int msgcompress(void);
 
 /* vprintf.c */
 /* XXX already in system headers included already - but with different
    argument declarations! */
 #if 0
-int vprintf __P((const char *, va_list));
-int vfprintf __P((FILE *, const char *, va_list));
-int vsprintf __P((char *, const char *, va_list));
-int vsnprintf __P((char *, size_t, const char *, va_list));
+int vprintf(const char *, va_list);
+int vfprintf(FILE *, const char *, va_list);
+int vsprintf(char *, const char *, va_list);
+int vsnprintf(char *, size_t, const char *, va_list);
 #endif
diff --git a/usr.bin/sup/src/supfilesrv.c b/usr.bin/sup/src/supfilesrv.c
index 63d1db40b5b..d29774fbe29 100644
--- a/usr.bin/sup/src/supfilesrv.c
+++ b/usr.bin/sup/src/supfilesrv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supfilesrv.c,v 1.26 2001/08/23 19:31:28 camield Exp $	*/
+/*	$OpenBSD: supfilesrv.c,v 1.27 2002/02/16 21:27:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -363,35 +363,35 @@ HASH *inodeH[HASHSIZE];			/* for inode lookup for linked file check */
 
 
 /* supfilesrv.c */
-int main __P((int, char **));
-void chldsig __P((int));
-void usage __P((void));
-void init __P((int, char **));
-void answer __P((void));
-void srvsignon __P((void));
-void srvsetup __P((void));
-void docrypt __P((void));
-void srvlogin __P((void));
-void listfiles __P((void));
-int denyone __P((TREE *, void *));
-void sendfiles __P((void));
-int sendone __P((TREE *, void *));
-int senddir __P((TREE *, void *));
-int sendfile __P((TREE *, va_list));
-void srvfinishup __P((time_t));
-void Hfree __P((HASH **));
-HASH *Hlookup __P((HASH **, int, int ));
-void Hinsert __P((HASH **, int, int, char *, TREE *));
-TREE *linkcheck __P((TREE *, int, int ));
-char *uconvert __P((uid_t));
-char *gconvert __P((gid_t));
-char *changeuid __P((char *, char *, uid_t, gid_t));
-void goaway __P((char *, ...));
-char *fmttime __P((time_t));
-int local_file __P((int, struct stat *));
-int stat_info_ok __P((struct stat *, struct stat *));
-int link_nofollow __P((int));
-int link_nofollow __P((int));
+int main(int, char **);
+void chldsig(int);
+void usage(void);
+void init(int, char **);
+void answer(void);
+void srvsignon(void);
+void srvsetup(void);
+void docrypt(void);
+void srvlogin(void);
+void listfiles(void);
+int denyone(TREE *, void *);
+void sendfiles(void);
+int sendone(TREE *, void *);
+int senddir(TREE *, void *);
+int sendfile(TREE *, va_list);
+void srvfinishup(time_t);
+void Hfree(HASH **);
+HASH *Hlookup(HASH **, int, int );
+void Hinsert(HASH **, int, int, char *, TREE *);
+TREE *linkcheck(TREE *, int, int );
+char *uconvert(uid_t);
+char *gconvert(gid_t);
+char *changeuid(char *, char *, uid_t, gid_t);
+void goaway(char *, ...);
+char *fmttime(time_t);
+int local_file(int, struct stat *);
+int stat_info_ok(struct stat *, struct stat *);
+int link_nofollow(int);
+int link_nofollow(int);
 
 /*************************************
  ***    M A I N   R O U T I N E    ***
diff --git a/usr.bin/sup/src/supmsg.c b/usr.bin/sup/src/supmsg.c
index edd636184c8..c639d637792 100644
--- a/usr.bin/sup/src/supmsg.c
+++ b/usr.bin/sup/src/supmsg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supmsg.c,v 1.8 2001/11/29 18:21:23 mpech Exp $	*/
+/*	$OpenBSD: supmsg.c,v 1.9 2002/02/16 21:27:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -69,11 +69,11 @@ extern int	pgmversion;		/* my program version */
 extern char	*scmver;		/* scm version of partner */
 extern int	fspid;			/* process id of fileserver */
 
-static int refuseone __P((TREE *, void *));
-static int listone __P((TREE *, void *));
-static int needone __P((TREE *, void *));
-static int denyone __P((TREE *, void *));
-static int writeone __P((TREE *, void *));
+static int refuseone(TREE *, void *);
+static int listone(TREE *, void *);
+static int needone(TREE *, void *);
+static int denyone(TREE *, void *);
+static int writeone(TREE *, void *);
 
 int
 msgsignon()
diff --git a/usr.bin/sup/src/supscan.c b/usr.bin/sup/src/supscan.c
index 1dd03e77702..8c6a516e334 100644
--- a/usr.bin/sup/src/supscan.c
+++ b/usr.bin/sup/src/supscan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supscan.c,v 1.11 2001/05/04 22:16:17 millert Exp $	*/
+/*	$OpenBSD: supscan.c,v 1.12 2002/02/16 21:27:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -160,11 +160,11 @@ TREE *listT;		/* final list of files in collection */
 TREE *refuseT = NULL;	/* list of all files specified by <coll>.list */
 
 
-void usage __P((void));
-void init __P((int, char **));
-static SCAN_COLLECTION *getscancoll __P((char *, char *, char *));
-int localhost __P((char *));
-int main __P((int, char **));
+void usage(void);
+void init(int, char **);
+static SCAN_COLLECTION *getscancoll(char *, char *, char *);
+int localhost(char *);
+int main(int, char **);
 
 /*************************************
  ***    M A I N   R O U T I N E    ***