Remove __P

Remove __STDC__ (which means we now use stdarg rather than vararg)
Remove register
Remove main prototype

2 files changed, 56 insertions, 76 deletions

diff --git a/games/cribbage/cribbage.h b/games/cribbage/cribbage.h
index dae270c..8eb1812 100644
--- a/games/cribbage/cribbage.h
+++ b/games/cribbage/cribbage.h
@@ -33,6 +33,10 @@
  *	@(#)cribbage.h	8.1 (Berkeley) 5/31/93
  */
 
+#include <sys/defs.h>
+
+__FBSDID("$FreeBSD$");
+
 extern  CARD		deck[ CARDS ];		/* a deck */
 extern  CARD		phand[ FULLHAND ];	/* player's hand */
 extern  CARD		chand[ FULLHAND ];	/* computer's hand */
@@ -59,54 +63,54 @@ extern	BOOLEAN		playing;		/* currently playing game */
 
 extern  char		expl[];			/* string for explanation */
 
-void	 addmsg __P((const char *, ...));
-int	 adjust __P((CARD [], CARD));
-int	 anymove __P((CARD [], int, int));
-int	 anysumto __P((CARD [], int, int, int));
-void	 bye __P((void));
-int	 cchose __P((CARD [], int, int));
-void	 cdiscard __P((BOOLEAN));
-int	 chkscr __P((int *, int));
-int	 comphand __P((CARD [], char *));
-void	 cremove __P((CARD, CARD [], int));
-int	 cut __P((BOOLEAN, int));
-int	 deal __P((int));
-void	 discard __P((BOOLEAN));
-void	 do_wait __P((void));
-void	 endmsg __P((void));
-int	 eq __P((CARD, CARD));
-int	 fifteens __P((CARD [], int));
-void	 game __P((void));
-void	 gamescore __P((void));
-char	*getline __P((void));
-int	 getuchar __P((void));
-int	 incard __P((CARD *));
-int	 infrom __P((CARD [], int, char *));
-void	 instructions __P((void));
-int	 isone __P((CARD, CARD [], int));
-void	 makeboard __P((void));
-void	 makedeck __P((CARD []));
-void	 makeknown __P((CARD [], int));
-void	 msg __P((const char *, ...));
-int	 msgcard __P((CARD, BOOLEAN));
-int	 msgcrd __P((CARD, BOOLEAN, char *, BOOLEAN));
-int	 number __P((int, int, char *));
-int	 numofval __P((CARD [], int, int));
-int	 pairuns __P((CARD [], int));
-int	 peg __P((BOOLEAN));
-int	 pegscore __P((CARD, CARD [], int, int));
-int	 playhand __P((BOOLEAN));
-int	 plyrhand __P((CARD [], char *));
-void	 prcard __P((WINDOW *, int, int, CARD, BOOLEAN));
-void	 prcrib __P((BOOLEAN, BOOLEAN));
-void	 prhand __P((CARD [], int, WINDOW *, BOOLEAN));
-void	 printcard __P((WINDOW *, int, CARD, BOOLEAN));
-void	 prpeg __P((int, int, BOOLEAN));
-void	 prtable __P((int));
-int	 readchar __P((void));
-void	 rint __P((int));
-int	 score __P((BOOLEAN));
-int	 scorehand __P((CARD [], CARD, int, BOOLEAN, BOOLEAN));
-void	 shuffle __P((CARD []));
-void	 sorthand __P((CARD [], int));
-void	 wait_for __P((int));
+void	 addmsg(const char *, ...);
+int	 adjust(CARD [], CARD);
+int	 anymove(CARD [], int, int);
+int	 anysumto(CARD [], int, int, int);
+void	 bye(void);
+int	 cchose(CARD [], int, int);
+void	 cdiscard(BOOLEAN);
+int	 chkscr(int *, int);
+int	 comphand(CARD [], char *);
+void	 cremove(CARD, CARD [], int);
+int	 cut(BOOLEAN, int);
+int	 deal(int);
+void	 discard(BOOLEAN);
+void	 do_wait(void);
+void	 endmsg(void);
+int	 eq(CARD, CARD);
+int	 fifteens(CARD [], int);
+void	 game(void);
+void	 gamescore(void);
+char	*getline(void);
+int	 getuchar(void);
+int	 incard(CARD *);
+int	 infrom(CARD [], int, char *);
+void	 instructions(void);
+int	 isone(CARD, CARD [], int);
+void	 makeboard(void);
+void	 makedeck(CARD []);
+void	 makeknown(CARD [], int);
+void	 msg(const char *, ...);
+int	 msgcard(CARD, BOOLEAN);
+int	 msgcrd(CARD, BOOLEAN, char *, BOOLEAN);
+int	 number(int, int, char *);
+int	 numofval(CARD [], int, int);
+int	 pairuns(CARD [], int);
+int	 peg(BOOLEAN);
+int	 pegscore(CARD, CARD [], int, int);
+int	 playhand(BOOLEAN);
+int	 plyrhand(CARD [], char *);
+void	 prcard(WINDOW *, int, int, CARD, BOOLEAN);
+void	 prcrib(BOOLEAN, BOOLEAN);
+void	 prhand(CARD [], int, WINDOW *, BOOLEAN);
+void	 printcard(WINDOW *, int, CARD, BOOLEAN);
+void	 prpeg(int, int, BOOLEAN);
+void	 prtable(int);
+int	 readchar(void);
+void	 rint(int);
+int	 score(BOOLEAN);
+int	 scorehand(CARD [], CARD, int, BOOLEAN, BOOLEAN);
+void	 shuffle(CARD []);
+void	 sorthand(CARD [], int);
+void	 wait_for(int);
diff --git a/games/cribbage/io.c b/games/cribbage/io.c
index 01b60e1..fd30a08 100644
--- a/games/cribbage/io.c
+++ b/games/cribbage/io.c
@@ -42,16 +42,12 @@ static const char rcsid[] =
 #include <ctype.h>
 #include <curses.h>
 #include <signal.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
 
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #include "deck.h"
 #include "cribbage.h"
@@ -389,21 +385,11 @@ int     Mpos = 0;
 static int Newpos = 0;
 
 void
-#if __STDC__
 msg(const char *fmt, ...)
-#else
-msg(fmt, va_alist)
-	char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
 
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	(void)vsprintf(&Msgbuf[Newpos], fmt, ap);
 	va_end(ap);
 	endmsg();
@@ -414,21 +400,11 @@ msg(fmt, va_alist)
  *	Add things to the current message
  */
 void
-#if __STDC__
 addmsg(const char *fmt, ...)
-#else
-addmsg(fmt, va_alist)
-	char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
 
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	(void)vsprintf(&Msgbuf[Newpos], fmt, ap);
 	va_end(ap);
 }