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.

4 files changed, 39 insertions, 39 deletions

diff --git a/usr.bin/rlogin/des_rw.c b/usr.bin/rlogin/des_rw.c
index 4515042706e..aec04db7ec2 100644
--- a/usr.bin/rlogin/des_rw.c
+++ b/usr.bin/rlogin/des_rw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: des_rw.c,v 1.9 2001/11/19 19:02:16 mpech Exp $	*/
+/*	$OpenBSD: des_rw.c,v 1.10 2002/02/16 21:27:51 millert Exp $	*/
 /*	$NetBSD: des_rw.c,v 1.2 1995/03/21 07:58:30 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)des_rw.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: des_rw.c,v 1.9 2001/11/19 19:02:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: des_rw.c,v 1.10 2002/02/16 21:27:51 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -53,10 +53,10 @@ static char rcsid[] = "$OpenBSD: des_rw.c,v 1.9 2001/11/19 19:02:16 mpech Exp $"
 #include <time.h>
 #include <unistd.h>
 
-void	desrw_set_key __P((des_cblock *, des_key_schedule *));
-void	desrw_clear_key __P((void));
-int	des_read __P((int, char *, int));
-int	des_write __P((int, char *, int));
+void	desrw_set_key(des_cblock *, des_key_schedule *);
+void	desrw_clear_key(void);
+int	des_read(int, char *, int);
+int	des_write(int, char *, int);
 
 static unsigned char	des_inbuf[10240], storage[10240], *store_ptr;
 static des_cblock 	*key;
diff --git a/usr.bin/rlogin/kcmd.c b/usr.bin/rlogin/kcmd.c
index 6217c3fd26a..400bc2e8668 100644
--- a/usr.bin/rlogin/kcmd.c
+++ b/usr.bin/rlogin/kcmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kcmd.c,v 1.13 2001/09/04 23:35:59 millert Exp $	*/
+/*	$OpenBSD: kcmd.c,v 1.14 2002/02/16 21:27:51 millert Exp $	*/
 /*	$NetBSD: kcmd.c,v 1.2 1995/03/21 07:58:32 cgd Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 static char Xsccsid[] = "derived from @(#)rcmd.c 5.17 (Berkeley) 6/27/88";
 static char sccsid[] = "@(#)kcmd.c	8.2 (Berkeley) 8/19/93";
 #else
-static char rcsid[] = "$OpenBSD: kcmd.c,v 1.13 2001/09/04 23:35:59 millert Exp $";
+static char rcsid[] = "$OpenBSD: kcmd.c,v 1.14 2002/02/16 21:27:51 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -72,7 +72,7 @@ static char rcsid[] = "$OpenBSD: kcmd.c,v 1.13 2001/09/04 23:35:59 millert Exp $
 
 #define	START_PORT	5120	 /* arbitrary */
 
-int	getport __P((int *));
+int	getport(int *);
 int	kcmd __P((int *, char **, u_short, char *, char *, char *,
 	    int *, KTEXT, char *, char *, CREDENTIALS *,
 	    Key_schedule, MSG_DAT *, struct sockaddr_in *,
diff --git a/usr.bin/rlogin/krcmd.c b/usr.bin/rlogin/krcmd.c
index fe0b87c3d52..fa0d85feeff 100644
--- a/usr.bin/rlogin/krcmd.c
+++ b/usr.bin/rlogin/krcmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: krcmd.c,v 1.8 2001/07/17 02:13:30 pvalchev Exp $	*/
+/*	$OpenBSD: krcmd.c,v 1.9 2002/02/16 21:27:51 millert Exp $	*/
 /*	$NetBSD: krcmd.c,v 1.2 1995/03/21 07:58:36 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)krcmd.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: krcmd.c,v 1.8 2001/07/17 02:13:30 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: krcmd.c,v 1.9 2002/02/16 21:27:51 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -63,7 +63,7 @@ static char rcsid[] = "$OpenBSD: krcmd.c,v 1.8 2001/07/17 02:13:30 pvalchev Exp
 int	kcmd __P((int *, char **, u_short, char *, char *, char *, int *,
 	    KTEXT, char *, char *, CREDENTIALS *, Key_schedule, MSG_DAT *,
 	    struct sockaddr_in *, struct sockaddr_in *, long));
-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));
 
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index c58cb106d12..d0f04dccbd9 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rlogin.c,v 1.27 2001/11/19 19:02:16 mpech Exp $	*/
+/*	$OpenBSD: rlogin.c,v 1.28 2002/02/16 21:27:51 millert Exp $	*/
 /*	$NetBSD: rlogin.c,v 1.8 1995/10/05 09:07:22 mycroft Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)rlogin.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: rlogin.c,v 1.27 2001/11/19 19:02:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: rlogin.c,v 1.28 2002/02/16 21:27:51 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -89,10 +89,10 @@ des_key_schedule schedule;
 int use_kerberos = 1, doencrypt;
 char dst_realm_buf[REALM_SZ], *dest_realm = NULL;
 
-int des_read __P((int, char *, int));
-int des_write __P((int, char *, int));
+int des_read(int, char *, int);
+int des_write(int, char *, int);
 
-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
@@ -126,32 +126,32 @@ struct winsize {
 #endif
 struct	winsize winsize;
 
-void		catch_child __P((int));
-void		copytochild __P((int));
-__dead void	doit __P((sigset_t *));
-__dead void	done __P((int));
-__dead void	sig_done __P((int));
-void		echo __P((char));
-u_int		getescape __P((char *));
-void		lostpeer __P((int));
-void		mode __P((int));
-void		msg __P((char *));
-void		oob __P((int));
-int		reader __P((sigset_t *));
-void		sendwindow __P((void));
-void		setsignal __P((int));
-void		sigwinch __P((int));
-void		stop __P((int));
-__dead void	usage __P((void)) __attribute__((__noreturn__));
-void		writer __P((void));
-void		writeroob __P((int));
+void		catch_child(int);
+void		copytochild(int);
+__dead void	doit(sigset_t *);
+__dead void	done(int);
+__dead void	sig_done(int);
+void		echo(char);
+u_int		getescape(char *);
+void		lostpeer(int);
+void		mode(int);
+void		msg(char *);
+void		oob(int);
+int		reader(sigset_t *);
+void		sendwindow(void);
+void		setsignal(int);
+void		sigwinch(int);
+void		stop(int);
+__dead void	usage(void) __attribute__((__noreturn__));
+void		writer(void);
+void		writeroob(int);
 
 #ifdef	KERBEROS
-void		warning __P((const char *, ...));
-void		desrw_set_key __P((des_cblock *, des_key_schedule *));
+void		warning(const char *, ...);
+void		desrw_set_key(des_cblock *, des_key_schedule *);
 #endif
 #ifdef OLDSUN
-int		get_window_size __P((int, struct winsize *));
+int		get_window_size(int, struct winsize *);
 #endif
 
 int