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

diff --git a/games/phantasia/phantglobs.h b/games/phantasia/phantglobs.h
index 980eb7d8a8f..81d187d9c1f 100644
--- a/games/phantasia/phantglobs.h
+++ b/games/phantasia/phantglobs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: phantglobs.h,v 1.3 1998/11/29 19:57:01 pjanzen Exp $	*/
+/*	$OpenBSD: phantglobs.h,v 1.4 2002/02/16 21:27:11 millert Exp $	*/
 /*	$NetBSD: phantglobs.h,v 1.3 1995/04/24 12:24:39 cgd Exp $	*/
 
 /*
@@ -64,72 +64,72 @@ extern	char	Nobetter[];
 
 /* functions which we need to know about */
 
-char	*descrlocation __P((struct player *, bool));
-char	*descrstatus __P((struct player *));
-char	*descrtype __P((struct player *, bool));
-void	activelist __P((void));
-void	adjuststats __P((void));
-long	allocrecord __P((void));
-long	allocvoid __P((void));
-void	allstatslist __P((void));
-void	altercoordinates __P((double, double, int));
-void	awardtreasure __P((void));
-void	battleplayer __P((long));
-void	callmonster __P((int));
-void	cancelmonster __P((void));
-void	catchalarm __P((int));
-void	changestats __P((bool));
-void	checkbattle __P((void));
-void	checktampered __P((void));
-void	cleanup __P((int));
-void	collecttaxes __P((double, double));
-void	cursedtreasure __P((void));
-void	death __P((char *));
-void	displaystats __P((void));
-double	distance __P((double, double, double, double));
-void	dotampered __P((void));
-double	drandom __P((void));
-void	encounter __P((int));
-void	enterscore __P((void));
-void	error __P((char *));
-double	explevel __P((double));
-long	findname __P((char *, struct player *));
-void	freerecord __P((struct player *, long));
-void	genchar __P((int));
-int	getanswer __P((char *, bool));
-void	getstring __P((char *, int));
-void	hitmonster __P((double));
-void	ill_sig __P((int));
-double	infloat __P((void));
-void	initialstate __P((void));
-void	initplayer __P((struct player *));
-int	inputoption __P((void));
-void	interrupt __P((void));
-void	leavegame __P((void));
-void	monsthits __P((void));
-void	monstlist __P((void));
-void	more __P((int));
-void	movelevel __P((void));
-void	myturn __P((void));
-void	neatstuff __P((void));
-int	pickmonster __P((void));
-void	playerhits __P((void));
-void	playinit __P((void));
-void	procmain __P((void));
-void	purgeoldplayers __P((void));
-void	readmessage __P((void));
-void	readrecord __P((struct player *, long));
-long	recallplayer __P((void));
-long	recallplayer __P((void));
-long	rollnewplayer __P((void));
-void	scorelist __P((void));
-void	scramblestats __P((void));
-void	tampered __P((int, double, double));
-void	throneroom __P((void));
-void	throwspell __P((void));
-void	titlelist __P((void));
-void	tradingpost __P((void));
-void	truncstring __P((char *));
-void	userlist __P((bool));
-void	writerecord __P((struct player *, long));
-void	writevoid __P((struct energyvoid *, long));
+char	*descrlocation(struct player *, bool);
+char	*descrstatus(struct player *);
+char	*descrtype(struct player *, bool);
+void	activelist(void);
+void	adjuststats(void);
+long	allocrecord(void);
+long	allocvoid(void);
+void	allstatslist(void);
+void	altercoordinates(double, double, int);
+void	awardtreasure(void);
+void	battleplayer(long);
+void	callmonster(int);
+void	cancelmonster(void);
+void	catchalarm(int);
+void	changestats(bool);
+void	checkbattle(void);
+void	checktampered(void);
+void	cleanup(int);
+void	collecttaxes(double, double);
+void	cursedtreasure(void);
+void	death(char *);
+void	displaystats(void);
+double	distance(double, double, double, double);
+void	dotampered(void);
+double	drandom(void);
+void	encounter(int);
+void	enterscore(void);
+void	error(char *);
+double	explevel(double);
+long	findname(char *, struct player *);
+void	freerecord(struct player *, long);
+void	genchar(int);
+int	getanswer(char *, bool);
+void	getstring(char *, int);
+void	hitmonster(double);
+void	ill_sig(int);
+double	infloat(void);
+void	initialstate(void);
+void	initplayer(struct player *);
+int	inputoption(void);
+void	interrupt(void);
+void	leavegame(void);
+void	monsthits(void);
+void	monstlist(void);
+void	more(int);
+void	movelevel(void);
+void	myturn(void);
+void	neatstuff(void);
+int	pickmonster(void);
+void	playerhits(void);
+void	playinit(void);
+void	procmain(void);
+void	purgeoldplayers(void);
+void	readmessage(void);
+void	readrecord(struct player *, long);
+long	recallplayer(void);
+long	recallplayer(void);
+long	rollnewplayer(void);
+void	scorelist(void);
+void	scramblestats(void);
+void	tampered(int, double, double);
+void	throneroom(void);
+void	throwspell(void);
+void	titlelist(void);
+void	tradingpost(void);
+void	truncstring(char *);
+void	userlist(bool);
+void	writerecord(struct player *, long);
+void	writevoid(struct energyvoid *, long);
diff --git a/games/phantasia/setup.c b/games/phantasia/setup.c
index e97596c6645..05f8d067788 100644
--- a/games/phantasia/setup.c
+++ b/games/phantasia/setup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setup.c,v 1.4 1998/11/29 19:57:02 pjanzen Exp $	*/
+/*	$OpenBSD: setup.c,v 1.5 2002/02/16 21:27:11 millert Exp $	*/
 /*	$NetBSD: setup.c,v 1.4 1995/04/24 12:24:41 cgd Exp $	*/
 
 /*
@@ -10,7 +10,7 @@
 #include "include.h"
 #include <fcntl.h>
 
-void Error __P((char *, char *));
+void Error(char *, char *);
 
 /**/
 /************************************************************************