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.

12 files changed, 95 insertions, 95 deletions

diff --git a/games/monop/cards.c b/games/monop/cards.c
index 5e3702371aa..9d36bad9e0b 100644
--- a/games/monop/cards.c
+++ b/games/monop/cards.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cards.c,v 1.4 2000/06/30 16:00:04 millert Exp $	*/
+/*	$OpenBSD: cards.c,v 1.5 2002/02/16 21:27:10 millert Exp $	*/
 /*	$NetBSD: cards.c,v 1.3 1995/03/23 08:34:35 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)cards.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: cards.c,v 1.4 2000/06/30 16:00:04 millert Exp $";
+static char rcsid[] = "$OpenBSD: cards.c,v 1.5 2002/02/16 21:27:10 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -60,8 +60,8 @@ static char	*cardfile	= "cards.pck";
 
 static FILE	*deckf;
 
-static void set_up __P((DECK *));
-static void printmes __P((void));
+static void set_up(DECK *);
+static void printmes(void);
 
 /*
  *	This routine initializes the decks from the data file,
diff --git a/games/monop/execute.c b/games/monop/execute.c
index 9e9b5e332f2..2e5746a3f09 100644
--- a/games/monop/execute.c
+++ b/games/monop/execute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: execute.c,v 1.4 2000/06/30 16:00:04 millert Exp $	*/
+/*	$OpenBSD: execute.c,v 1.5 2002/02/16 21:27:10 millert Exp $	*/
 /*	$NetBSD: execute.c,v 1.3 1995/03/23 08:34:38 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)execute.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: execute.c,v 1.4 2000/06/30 16:00:04 millert Exp $";
+static char rcsid[] = "$OpenBSD: execute.c,v 1.5 2002/02/16 21:27:10 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -60,7 +60,7 @@ static char	buf[257];
 
 static bool	new_play;	/* set if move on to new player		*/
 
-static void	show_move __P((void));
+static void	show_move(void);
 
 /*
  *	This routine takes user input and puts it in buf
diff --git a/games/monop/getinp.c b/games/monop/getinp.c
index 75393b0a319..a8bf164f547 100644
--- a/games/monop/getinp.c
+++ b/games/monop/getinp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getinp.c,v 1.4 2000/07/24 00:56:04 pjanzen Exp $	*/
+/*	$OpenBSD: getinp.c,v 1.5 2002/02/16 21:27:10 millert Exp $	*/
 /*	$NetBSD: getinp.c,v 1.4 1995/04/24 12:24:20 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)getinp.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: getinp.c,v 1.4 2000/07/24 00:56:04 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: getinp.c,v 1.5 2002/02/16 21:27:10 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: getinp.c,v 1.4 2000/07/24 00:56:04 pjanzen Exp
 
 static char	buf[257];
 
-static int	comp __P((char *));
+static int	comp(char *);
 
 int
 getinp(prompt, list)
diff --git a/games/monop/houses.c b/games/monop/houses.c
index eed8ae029ed..3b089ff3773 100644
--- a/games/monop/houses.c
+++ b/games/monop/houses.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: houses.c,v 1.2 1998/09/20 23:36:51 pjanzen Exp $	*/
+/*	$OpenBSD: houses.c,v 1.3 2002/02/16 21:27:10 millert Exp $	*/
 /*	$NetBSD: houses.c,v 1.3 1995/03/23 08:34:40 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)houses.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: houses.c,v 1.2 1998/09/20 23:36:51 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: houses.c,v 1.3 2002/02/16 21:27:10 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -49,9 +49,9 @@ static char	*names[N_MON+2],
 
 static MON	*monops[N_MON];
 
-static void	buy_h __P((MON *));
-static void	sell_h __P((MON *));
-static void	list_cur __P((MON *));
+static void	buy_h(MON *);
+static void	sell_h(MON *);
+static void	list_cur(MON *);
 
 /*
  *	These routines deal with buying and selling houses
diff --git a/games/monop/initdeck.c b/games/monop/initdeck.c
index b33f13276ca..d86e1ad9d52 100644
--- a/games/monop/initdeck.c
+++ b/games/monop/initdeck.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: initdeck.c,v 1.8 2000/11/10 15:33:03 provos Exp $	*/
+/*	$OpenBSD: initdeck.c,v 1.9 2002/02/16 21:27:10 millert Exp $	*/
 /*	$NetBSD: initdeck.c,v 1.3 1995/03/23 08:34:43 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)initdeck.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: initdeck.c,v 1.8 2000/11/10 15:33:03 provos Exp $";
+static char rcsid[] = "$OpenBSD: initdeck.c,v 1.9 2002/02/16 21:27:10 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -77,9 +77,9 @@ DECK	deck[2];
 
 FILE	*inf, *outf;
 
-static void	getargs __P((int, char *[]));
-static void	count __P((void));
-static void	putem __P((void));
+static void	getargs(int, char *[]);
+static void	count(void);
+static void	putem(void);
 
 int
 main(ac, av)
diff --git a/games/monop/monop.c b/games/monop/monop.c
index 5558b84ec65..2266be4137a 100644
--- a/games/monop/monop.c
+++ b/games/monop/monop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: monop.c,v 1.3 2001/01/04 20:41:31 todd Exp $	*/
+/*	$OpenBSD: monop.c,v 1.4 2002/02/16 21:27:10 millert Exp $	*/
 /*	$NetBSD: monop.c,v 1.3 1995/03/23 08:34:52 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)monop.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: monop.c,v 1.3 2001/01/04 20:41:31 todd Exp $";
+static char rcsid[] = "$OpenBSD: monop.c,v 1.4 2002/02/16 21:27:10 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -54,10 +54,10 @@ static char rcsid[] = "$OpenBSD: monop.c,v 1.3 2001/01/04 20:41:31 todd Exp $";
 #include	<unistd.h>
 #include	"monop.def"
 
-static void	getplayers __P((void));
-static void	init_players __P((void));
-static void	init_monops __P((void));
-static void	do_quit __P((int));
+static void	getplayers(void);
+static void	init_players(void);
+static void	init_monops(void);
+static void	do_quit(int);
 
 /*
  *	This program implements a monopoly game
diff --git a/games/monop/monop.def b/games/monop/monop.def
index 3a187b2a27b..0fb4614cfd7 100644
--- a/games/monop/monop.def
+++ b/games/monop/monop.def
@@ -1,4 +1,4 @@
-/*	$OpenBSD: monop.def,v 1.2 1998/09/20 23:36:52 pjanzen Exp $	*/
+/*	$OpenBSD: monop.def,v 1.3 2002/02/16 21:27:10 millert Exp $	*/
 /*	$NetBSD: monop.def,v 1.3 1995/03/23 08:34:54 cgd Exp $	*/
 
 /*-
@@ -81,7 +81,7 @@ int	player,			/* current player number		*/
 	num_luck	= sizeof lucky_mes / sizeof (char *);
 
 /* list of command functions		*/
-void (*func[]) __P((void)) = {	/* array of function calls for commands	*/
+void (*func[])(void) = {	/* array of function calls for commands	*/
 	quit,			/* quit game		|*  0 *|	*/
 	printboard,		/* print board		|*  1 *|	*/
 	where,			/* where players are	|*  2 *|	*/
diff --git a/games/monop/monop.h b/games/monop/monop.h
index 75c8bdd5e06..7a2bb5b7db7 100644
--- a/games/monop/monop.h
+++ b/games/monop/monop.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: monop.h,v 1.4 1998/09/20 23:36:54 pjanzen Exp $	*/
+/*	$OpenBSD: monop.h,v 1.5 2002/02/16 21:27:10 millert Exp $	*/
 /*	$NetBSD: monop.h,v 1.4 1995/04/24 12:24:23 cgd Exp $	*/
 
 /*
@@ -137,74 +137,74 @@ typedef struct prp_st	RR_S;
 typedef struct prp_st	UTIL_S;
 
 /* cards.c */
-void	init_decks __P((void));
-void	get_card __P((DECK *));
+void	init_decks(void);
+void	get_card(DECK *);
 
 /* execute.c */
-void	execute __P((int));
-void	do_move __P((void));
-void	move __P((int));
-void	save __P((void));
-void	restore __P((void));
-int	rest_f __P((char *));
+void	execute(int);
+void	do_move(void);
+void	move(int);
+void	save(void);
+void	restore(void);
+int	rest_f(char *);
 
 /* getinp.c */
-int	getinp __P((char *, char *[]));
+int	getinp(char *, char *[]);
 
 /* houses.c */
-void	buy_houses __P((void));
-void	sell_houses __P((void));
+void	buy_houses(void);
+void	sell_houses(void);
 
 /* jail.c */
-void	card __P((void));
-void	ret_card __P((PLAY *));
-void	pay __P((void));
-int	move_jail __P((int, int ));
-void	printturn __P((void));
+void	card(void);
+void	ret_card(PLAY *);
+void	pay(void);
+int	move_jail(int, int );
+void	printturn(void);
 
 /* misc.c */
-int	getyn __P((char *));
-void	notify __P((void));
-void	next_play __P((void));
-int	get_int __P((char *));
-void	set_ownlist __P((int));
-void	is_monop __P((MON *, int));
-void	isnot_monop __P((MON *));
-void	list __P((void));
-void	list_all __P((void));
-void	quit __P((void));
+int	getyn(char *);
+void	notify(void);
+void	next_play(void);
+int	get_int(char *);
+void	set_ownlist(int);
+void	is_monop(MON *, int);
+void	isnot_monop(MON *);
+void	list(void);
+void	list_all(void);
+void	quit(void);
 
 /* morg.c */
-void	mortgage __P((void));
-void	unmortgage __P((void));
-void	force_morg __P((void));
+void	mortgage(void);
+void	unmortgage(void);
+void	force_morg(void);
 
 /* print.c */
-void	printboard __P((void));
-void	where __P((void));
-void	printsq __P((int, bool));
-void	printhold __P((int));
+void	printboard(void);
+void	where(void);
+void	printsq(int, bool);
+void	printhold(int);
 
 /* prop.c */
-void	buy __P((int, SQUARE *));
-void	add_list __P((int, OWN **, int));
-void	del_list __P((int, OWN **, shrt));
-void	bid __P((void));
-int	prop_worth __P((PLAY *));
+void	buy(int, SQUARE *);
+void	add_list(int, OWN **, int);
+void	del_list(int, OWN **, shrt);
+void	bid(void);
+int	prop_worth(PLAY *);
 
 /* rent.c */
-void	rent __P((SQUARE *));
+void	rent(SQUARE *);
 
 /* roll.c */
-int	roll __P((int, int));
+int	roll(int, int);
 
 /* spec.c */
-void	inc_tax __P((void));
-void	goto_jail __P((void));
-void	lux_tax __P((void));
-void	cc __P((void));
-void	chance __P((void));
+void	inc_tax(void);
+void	goto_jail(void);
+void	lux_tax(void);
+void	cc(void);
+void	chance(void);
 
 /* trade.c */
-void	trade __P((void));
-void	resign __P((void));
+void	trade(void);
+void	resign(void);
diff --git a/games/monop/morg.c b/games/monop/morg.c
index 46c027242ec..d9e1b30af96 100644
--- a/games/monop/morg.c
+++ b/games/monop/morg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: morg.c,v 1.2 1998/09/20 23:36:54 pjanzen Exp $	*/
+/*	$OpenBSD: morg.c,v 1.3 2002/02/16 21:27:11 millert Exp $	*/
 /*	$NetBSD: morg.c,v 1.4 1995/03/23 08:35:02 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)morg.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: morg.c,v 1.2 1998/09/20 23:36:54 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: morg.c,v 1.3 2002/02/16 21:27:11 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -72,10 +72,10 @@ static shrt	square[MAX_PRP+2];
 
 static int	num_good,got_houses;
 
-static int	set_mlist __P((void));
-static void	m __P((int));
-static int	set_umlist __P((void));
-static void	unm __P((int));
+static int	set_mlist(void);
+static void	m(int);
+static int	set_umlist(void);
+static void	unm(int);
 
 /*
  *	This routine is the command level response the mortgage command.
diff --git a/games/monop/print.c b/games/monop/print.c
index 69ab9e3e838..b66e9e48d41 100644
--- a/games/monop/print.c
+++ b/games/monop/print.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.c,v 1.2 1998/09/20 23:36:55 pjanzen Exp $	*/
+/*	$OpenBSD: print.c,v 1.3 2002/02/16 21:27:11 millert Exp $	*/
 /*	$NetBSD: print.c,v 1.3 1995/03/23 08:35:05 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: print.c,v 1.2 1998/09/20 23:36:55 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: print.c,v 1.3 2002/02/16 21:27:11 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -46,7 +46,7 @@ static char rcsid[] = "$OpenBSD: print.c,v 1.2 1998/09/20 23:36:55 pjanzen Exp $
 
 static char	*header	= "Name      Own      Price Mg # Rent";
 
-static void	printmorg __P((SQUARE *));
+static void	printmorg(SQUARE *);
 
 /*
  *	This routine prints out the current board
diff --git a/games/monop/prop.c b/games/monop/prop.c
index 6568c25ffe0..441ac90aab1 100644
--- a/games/monop/prop.c
+++ b/games/monop/prop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prop.c,v 1.3 2001/01/17 00:27:21 pjanzen Exp $	*/
+/*	$OpenBSD: prop.c,v 1.4 2002/02/16 21:27:11 millert Exp $	*/
 /*	$NetBSD: prop.c,v 1.3 1995/03/23 08:35:06 cgd Exp $	*/
 
 /*
@@ -38,14 +38,14 @@
 #if 0
 static char sccsid[] = "@(#)prop.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: prop.c,v 1.3 2001/01/17 00:27:21 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: prop.c,v 1.4 2002/02/16 21:27:11 millert Exp $";
 #endif
 #endif /* not lint */
 
 #include	<err.h>
 #include	"monop.ext"
 
-static int	value __P((SQUARE *));
+static int	value(SQUARE *);
 
 /*
  *	This routine deals with buying property, setting all the
diff --git a/games/monop/trade.c b/games/monop/trade.c
index c0ea9f38d24..75c206da790 100644
--- a/games/monop/trade.c
+++ b/games/monop/trade.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trade.c,v 1.2 1998/09/20 23:36:56 pjanzen Exp $	*/
+/*	$OpenBSD: trade.c,v 1.3 2002/02/16 21:27:11 millert Exp $	*/
 /*	$NetBSD: trade.c,v 1.3 1995/03/23 08:35:19 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)trade.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: trade.c,v 1.2 1998/09/20 23:36:56 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: trade.c,v 1.3 2002/02/16 21:27:11 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -59,11 +59,11 @@ static int	used[MAX_PRP];
 
 static TRADE	trades[2];
 
-static void	get_list __P((int, int ));
-static int	set_list __P((OWN *));
-static void	summate __P((void));
-static void	do_trade __P((void));
-static void	move_em __P((TRADE *, TRADE *));
+static void	get_list(int, int );
+static int	set_list(OWN *);
+static void	summate(void);
+static void	do_trade(void);
+static void	move_em(TRADE *, TRADE *);
 
 void
 trade()