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, 20 insertions, 20 deletions

diff --git a/games/quiz/quiz.c b/games/quiz/quiz.c
index dccb74c9719..ce73b3bfceb 100644
--- a/games/quiz/quiz.c
+++ b/games/quiz/quiz.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quiz.c,v 1.9 1999/10/02 06:36:45 pjanzen Exp $	*/
+/*	$OpenBSD: quiz.c,v 1.10 2002/02/16 21:27:11 millert Exp $	*/
 /*	$NetBSD: quiz.c,v 1.9 1995/04/22 10:16:58 cgd Exp $	*/
 
 /*-
@@ -48,7 +48,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)quiz.c	8.3 (Berkeley) 5/4/95";
 #else
-static char rcsid[] = "$OpenBSD: quiz.c,v 1.9 1999/10/02 06:36:45 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: quiz.c,v 1.10 2002/02/16 21:27:11 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -68,15 +68,15 @@ static QE qlist;
 static int catone, cattwo, tflag;
 static u_int qsize;
 
-char	*appdstr __P((char *, const char *, size_t));
-void	 downcase __P((char *));
-void	 get_cats __P((char *, char *));
-void	 get_file __P((const char *));
-const char	*next_cat __P((const char *));
-void	 quiz __P((void));
-void	 score __P((u_int, u_int, u_int));
-void	 show_index __P((void));
-void	 usage __P((void));
+char	*appdstr(char *, const char *, size_t);
+void	 downcase(char *);
+void	 get_cats(char *, char *);
+void	 get_file(const char *);
+const char	*next_cat(const char *);
+void	 quiz(void);
+void	 score(u_int, u_int, u_int);
+void	 show_index(void);
+void	 usage(void);
 
 int
 main(argc, argv)
diff --git a/games/quiz/quiz.h b/games/quiz/quiz.h
index 63441eb2bee..1c9f38a2b23 100644
--- a/games/quiz/quiz.h
+++ b/games/quiz/quiz.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quiz.h,v 1.3 1999/03/27 04:45:26 pjanzen Exp $	*/
+/*	$OpenBSD: quiz.h,v 1.4 2002/02/16 21:27:11 millert Exp $	*/
 /*	$NetBSD: quiz.h,v 1.4 1995/04/22 10:16:59 cgd Exp $	*/
 
 /*-
@@ -59,6 +59,6 @@ typedef struct qentry {
 
 extern char rxperr[];
 
-int	 rxp_compile __P((const char *));
-char	*rxp_expand __P((void));
-int	 rxp_match __P((const char *));
+int	 rxp_compile(const char *);
+char	*rxp_expand(void);
+int	 rxp_match(const char *);
diff --git a/games/quiz/rxp.c b/games/quiz/rxp.c
index 43da86fe705..8662e8285be 100644
--- a/games/quiz/rxp.c
+++ b/games/quiz/rxp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rxp.c,v 1.4 1999/10/02 06:36:45 pjanzen Exp $	*/
+/*	$OpenBSD: rxp.c,v 1.5 2002/02/16 21:27:11 millert Exp $	*/
 /*	$NetBSD: rxp.c,v 1.5 1995/04/22 10:17:00 cgd Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)rxp.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: rxp.c,v 1.4 1999/10/02 06:36:45 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: rxp.c,v 1.5 2002/02/16 21:27:11 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -85,9 +85,9 @@ typedef short Rxp_t;			/* type for regexp tokens */
 static Rxp_t rxpbuf[RXP_LINE_SZ];	/* compiled regular expression buffer */
 char rxperr[128];			/* parser error message */
 
-static int	 rxp__compile __P((const char *, int));
-static char	*rxp__expand __P((int));
-static int	 rxp__match __P((const char *, int, Rxp_t *, Rxp_t *, const char *));
+static int	 rxp__compile(const char *, int);
+static char	*rxp__expand(int);
+static int	 rxp__match(const char *, int, Rxp_t *, Rxp_t *, const char *);
 
 int
 rxp_compile(s)