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.

3 files changed, 30 insertions, 30 deletions

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()