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.

2 files changed, 20 insertions, 20 deletions

diff --git a/bin/rcp/extern.h b/bin/rcp/extern.h
index b909d9524de..4ab443f10a4 100644
--- a/bin/rcp/extern.h
+++ b/bin/rcp/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.3 2001/09/06 13:29:08 mpech Exp $	*/
+/*	$OpenBSD: extern.h,v 1.4 2002/02/16 21:27:07 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.2 1995/03/21 08:19:01 cgd Exp $	*/
 
 /*-
@@ -44,11 +44,11 @@ typedef struct {
 extern int iamremote;
 extern char *__progname;
 
-BUF	*allocbuf __P((BUF *, int, int));
-char	*colon __P((char *));
-void	 lostconn __P((int));
-void	 nospace __P((void));
-int	 okname __P((char *));
-void	 run_err __P((const char *, ...));
-int	 susystem __P((char *, int));
-void	 verifydir __P((char *));
+BUF	*allocbuf(BUF *, int, int);
+char	*colon(char *);
+void	 lostconn(int);
+void	 nospace(void);
+int	 okname(char *);
+void	 run_err(const char *, ...);
+int	 susystem(char *, int);
+void	 verifydir(char *);
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index 5e9126277ba..3368beab00d 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcp.c,v 1.25 2001/11/21 15:35:28 markus Exp $	*/
+/*	$OpenBSD: rcp.c,v 1.26 2002/02/16 21:27:07 millert Exp $	*/
 /*	$NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $	*/
 
 /*
@@ -99,20 +99,20 @@ int pflag, iamremote, iamrecursive, targetshouldbedirectory;
 char cmd[CMDNEEDS];		/* must hold "rcp -r -p -d\0" */
 
 #ifdef KERBEROS
-int	 kerberos __P((char **, char *, char *, char *));
-void	 oldw __P((const char *, ...));
+int	 kerberos(char **, char *, char *, char *);
+void	 oldw(const char *, ...);
 /* XXX from ../../usr.bin/rlogin/krcmd.c */
-int krcmd __P((char **, u_short, char *, char *, int *, char *));
+int krcmd(char **, u_short, char *, char *, int *, char *);
 int krcmd_mutual __P((char **, u_short, char *, char *, int *,
 		       char *, CREDENTIALS *, Key_schedule));
 #endif
-int	 response __P((void));
-void	 rsource __P((char *, struct stat *));
-void	 sink __P((int, char *[]));
-void	 source __P((int, char *[]));
-void	 tolocal __P((int, char *[]));
-void	 toremote __P((char *, int, char *[]));
-void	 usage __P((void));
+int	 response(void);
+void	 rsource(char *, struct stat *);
+void	 sink(int, char *[]);
+void	 source(int, char *[]);
+void	 tolocal(int, char *[]);
+void	 toremote(char *, int, char *[]);
+void	 usage(void);
 
 int
 main(argc, argv)