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.

5 files changed, 82 insertions, 82 deletions

diff --git a/games/battlestar/battlestar.c b/games/battlestar/battlestar.c
index b65b54a8b8d..eaf7b12f88f 100644
--- a/games/battlestar/battlestar.c
+++ b/games/battlestar/battlestar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: battlestar.c,v 1.11 2000/09/26 04:42:54 pjanzen Exp $	*/
+/*	$OpenBSD: battlestar.c,v 1.12 2002/02/16 21:27:09 millert Exp $	*/
 /*	$NetBSD: battlestar.c,v 1.3 1995/03/21 15:06:47 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)battlestar.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: battlestar.c,v 1.11 2000/09/26 04:42:54 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: battlestar.c,v 1.12 2002/02/16 21:27:09 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -58,7 +58,7 @@ static char rcsid[] = "$OpenBSD: battlestar.c,v 1.11 2000/09/26 04:42:54 pjanzen
 #include "extern.h"
 #include "pathnames.h"
 
-int main __P((int, char *[]));
+int main(int, char *[]);
 
 int
 main(argc, argv)
diff --git a/games/battlestar/extern.h b/games/battlestar/extern.h
index 5dd528d9f18..c5822f9427f 100644
--- a/games/battlestar/extern.h
+++ b/games/battlestar/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.11 2000/09/26 04:42:56 pjanzen Exp $	*/
+/*	$OpenBSD: extern.h,v 1.12 2002/02/16 21:27:09 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.5 1995/04/24 12:22:18 cgd Exp $	*/
 
 /*
@@ -331,62 +331,62 @@ struct objs {
 extern const struct objs dayobjs[];
 extern const struct objs nightobjs[];
 
-void bury __P((void));
-int card __P((const char *, int));
-void chime __P((void));
-void convert __P((int));
-void crash __P((void));
-int cypher __P((void));
-void die __P((int));
-void dig __P((void));
-void dooropen __P((void));
-int draw __P((void));
-void drink __P((void));
-int drive __P((void));
-int drop __P((const char *));
-int eat __P((void));
-int fight __P((int, int));
-int follow __P((void));
-char *getcom __P((char *, int, const char *, const char *));
-char *getword __P((char *, char *, int));
-int give __P((void));
-int inc_wordnumber __P((const char *, const char *));
-void initialize __P((const char *));
-int jump __P((void));
-void kiss __P((void));
-int land __P((void));
-int launch __P((void));
-void light __P((void));
-void live __P((void));
-void love __P((void));
-int moveplayer __P((int, int));
-void murder __P((void));
-void newlocation __P((void));
-void news __P((void));
-void newway __P((int));
-void open_score_file __P((void));
-void parse __P((void));
-void post __P((char));
-void printobjs __P((void));
-int put __P((void));
-int puton __P((void));
-const char *rate __P((void));
-void ravage __P((void));
-void restore __P((const char *));
-int ride __P((void));
-void save __P((const char *));
-char *save_file_name __P((const char *, size_t));
-int shoot __P((void));
-int take __P((unsigned int[]));
-int takeoff __P((void));
-int throw __P((const char *));
-const char *truedirec __P((int, char));
-int ucard __P((const unsigned int *));
-void undress __P((void));
-int use __P((void));
-int visual __P((void));
-int wearit __P((void));
-void whichway __P((struct room));
-void wordinit __P((void));
-void writedes __P((void));
-int zzz __P((void));
+void bury(void);
+int card(const char *, int);
+void chime(void);
+void convert(int);
+void crash(void);
+int cypher(void);
+void die(int);
+void dig(void);
+void dooropen(void);
+int draw(void);
+void drink(void);
+int drive(void);
+int drop(const char *);
+int eat(void);
+int fight(int, int);
+int follow(void);
+char *getcom(char *, int, const char *, const char *);
+char *getword(char *, char *, int);
+int give(void);
+int inc_wordnumber(const char *, const char *);
+void initialize(const char *);
+int jump(void);
+void kiss(void);
+int land(void);
+int launch(void);
+void light(void);
+void live(void);
+void love(void);
+int moveplayer(int, int);
+void murder(void);
+void newlocation(void);
+void news(void);
+void newway(int);
+void open_score_file(void);
+void parse(void);
+void post(char);
+void printobjs(void);
+int put(void);
+int puton(void);
+const char *rate(void);
+void ravage(void);
+void restore(const char *);
+int ride(void);
+void save(const char *);
+char *save_file_name(const char *, size_t);
+int shoot(void);
+int take(unsigned int[]);
+int takeoff(void);
+int throw(const char *);
+const char *truedirec(int, char);
+int ucard(const unsigned int *);
+void undress(void);
+int use(void);
+int visual(void);
+int wearit(void);
+void whichway(struct room);
+void wordinit(void);
+void writedes(void);
+int zzz(void);
diff --git a/games/battlestar/fly.c b/games/battlestar/fly.c
index e5053748717..feac9388cba 100644
--- a/games/battlestar/fly.c
+++ b/games/battlestar/fly.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fly.c,v 1.8 2000/09/24 21:55:25 pjanzen Exp $	*/
+/*	$OpenBSD: fly.c,v 1.9 2002/02/16 21:27:09 millert Exp $	*/
 /*	$NetBSD: fly.c,v 1.3 1995/03/21 15:07:28 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)fly.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: fly.c,v 1.8 2000/09/24 21:55:25 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: fly.c,v 1.9 2002/02/16 21:27:09 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -57,13 +57,13 @@ static char    destroyed;
 static char    cross = 0;
 static sig_t   oldsig;
 
-static void blast __P((void));
-static void endfly __P((void));
-static void moveenemy __P((int));
-static void notarget __P((void));
-static void screen __P((void));
-static void succumb __P((int));
-static void target __P((void));
+static void blast(void);
+static void endfly(void);
+static void moveenemy(int);
+static void notarget(void);
+static void screen(void);
+static void succumb(int);
+static void target(void);
 
 static void
 succumb(sigraised)
diff --git a/games/battlestar/init.c b/games/battlestar/init.c
index e100fcbcae1..c61a05451ba 100644
--- a/games/battlestar/init.c
+++ b/games/battlestar/init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init.c,v 1.7 2000/09/24 21:55:25 pjanzen Exp $	*/
+/*	$OpenBSD: init.c,v 1.8 2002/02/16 21:27:09 millert Exp $	*/
 /*	$NetBSD: init.c,v 1.4 1995/03/21 15:07:35 cgd Exp $	*/
 
 /*
@@ -38,15 +38,15 @@
 #if 0
 static char sccsid[] = "@(#)init.c	8.4 (Berkeley) 4/30/95";
 #else
-static char rcsid[] = "$OpenBSD: init.c,v 1.7 2000/09/24 21:55:25 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: init.c,v 1.8 2002/02/16 21:27:09 millert Exp $";
 #endif
 #endif /* not lint */
 
 #include "extern.h"
 
-static int checkout __P((const char *));
-static const char *getutmp __P((void));
-static int wizard __P((const char *));
+static int checkout(const char *);
+static const char *getutmp(void);
+static int wizard(const char *);
 
 void
 initialize(filename)
diff --git a/games/battlestar/parse.c b/games/battlestar/parse.c
index ada345890ed..eaa2c850fff 100644
--- a/games/battlestar/parse.c
+++ b/games/battlestar/parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.c,v 1.10 2000/09/26 04:42:56 pjanzen Exp $	*/
+/*	$OpenBSD: parse.c,v 1.11 2002/02/16 21:27:09 millert Exp $	*/
 /*	$NetBSD: parse.c,v 1.3 1995/03/21 15:07:48 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)parse.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: parse.c,v 1.10 2000/09/26 04:42:56 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: parse.c,v 1.11 2002/02/16 21:27:09 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -48,9 +48,9 @@ static char rcsid[] = "$OpenBSD: parse.c,v 1.10 2000/09/26 04:42:56 pjanzen Exp
 #define HASHMUL		81
 #define HASHMASK	(HASHSIZE - 1)
 
-static int hash __P((const char *));
-static void install __P((struct wlist *));
-static struct wlist *lookup __P((const char *));
+static int hash(const char *);
+static void install(struct wlist *);
+static struct wlist *lookup(const char *);
 
 struct wlist *hashtab[HASHSIZE];