WARNSify

Author: lukem

games/mille/comp.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: comp.c,v 1.4 1995/03/24 05:01:11 cgd Exp $	*/
+/*	$NetBSD: comp.c,v 1.5 1997/10/12 00:53:45 lukem Exp $	*/
 
 /*
  * Copyright (c) 1982, 1993
@@ -33,11 +33,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)comp.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: comp.c,v 1.4 1995/03/24 05:01:11 cgd Exp $";
+__RCSID("$NetBSD: comp.c,v 1.5 1997/10/12 00:53:45 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -49,17 +50,18 @@ static char rcsid[] = "$NetBSD: comp.c,v 1.4 1995/03/24 05:01:11 cgd Exp $";
 
 # define	V_VALUABLE	40
 
+void
 calcmove()
 {
-	register CARD		card;
-	register int		*value;
-	register PLAY		*pp, *op;
-	register bool		foundend, cango, canstop, foundlow;
-	register unsgn int	i, count200, badcount, nummin, nummax, diff;
-	register int		curmin, curmax;
-	register CARD		safe, oppos;
-	int			valbuf[HAND_SZ], count[NUM_CARDS];
-	bool			playit[HAND_SZ];
+	CARD		card;
+	int		*value;
+	PLAY		*pp, *op;
+	bool		foundend, cango, canstop, foundlow;
+	unsgn int	i, count200, badcount, nummin, nummax, diff;
+	int		curmin, curmax;
+	CARD		safe, oppos;
+	int		valbuf[HAND_SZ], count[NUM_CARDS];
+	bool		playit[HAND_SZ];
 
 	wmove(Score, ERR_Y, ERR_X);	/* get rid of error messages	*/
 	wclrtoeol(Score);
@@ -78,7 +80,7 @@ calcmove()
 		switch (card) {
 		  case C_STOP:	case C_CRASH:
 		  case C_FLAT:	case C_EMPTY:
-			if (playit[i] = canplay(pp, op, card))
+			if ((playit[i] = canplay(pp, op, card)) != 0)
 				canstop = TRUE;
 			goto norm;
 		  case C_LIMIT:
@@ -404,17 +406,18 @@ calcmove()
 /*
  * Return true if the given player could conceivably win with his next card.
  */
+int
 onecard(pp)
-register PLAY	*pp;
+	PLAY	*pp;
 {
-	register CARD	bat, spd, card;
+	CARD	bat, spd, card;
 
 	bat = pp->battle;
 	spd = pp->speed;
 	card = -1;
 	if (pp->can_go || ((isrepair(bat) || bat == C_STOP || spd == C_LIMIT) &&
 			   Numseen[S_RIGHT_WAY] != 0) ||
-	    bat >= 0 && Numseen[safety(bat)] != 0)
+	    (bat >= 0 && Numseen[safety(bat)] != 0))
 		switch (End - pp->mileage) {
 		  case 200:
 			if (pp->nummiles[C_200] == 2)
@@ -436,9 +439,10 @@ register PLAY	*pp;
 	return FALSE;
 }
 
+int
 canplay(pp, op, card)
-register PLAY	*pp, *op;
-register CARD	card;
+	PLAY	*pp, *op;
+	CARD	card;
 {
 	switch (card) {
 	  case C_200:

games/mille/end.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: end.c,v 1.5 1997/05/23 23:09:36 jtc Exp $	*/
+/*	$NetBSD: end.c,v 1.6 1997/10/12 00:53:51 lukem Exp $	*/
 
 /*
  * Copyright (c) 1982, 1993
@@ -33,11 +33,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)end.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: end.c,v 1.5 1997/05/23 23:09:36 jtc Exp $";
+__RCSID("$NetBSD: end.c,v 1.6 1997/10/12 00:53:51 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -51,10 +52,11 @@ static char rcsid[] = "$NetBSD: end.c,v 1.5 1997/05/23 23:09:36 jtc Exp $";
  *	print out the score as if it was final, and add the totals for
  * the end-of-games points to the user who deserves it (if any).
  */
+void
 finalscore(pp)
-register PLAY	*pp;
+	PLAY	*pp;
 {
-	register int	temp, tot, num;
+	int	temp, tot, num;
 
 	if (pp->was_finished == Finished)
 		return;
@@ -151,4 +153,3 @@ undoex() {
 	}
 }
 # endif
-

games/mille/extern.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.c,v 1.4 1995/03/24 05:01:36 cgd Exp $	*/
+/*	$NetBSD: extern.c,v 1.5 1997/10/12 00:53:55 lukem Exp $	*/
 
 /*
  * Copyright (c) 1982, 1993
@@ -33,11 +33,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)extern.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: extern.c,v 1.4 1995/03/24 05:01:36 cgd Exp $";
+__RCSID("$NetBSD: extern.c,v 1.5 1997/10/12 00:53:55 lukem Exp $");
 #endif
 #endif /* not lint */
 

games/mille/init.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.6 1997/05/23 23:09:37 jtc Exp $	*/
+/*	$NetBSD: init.c,v 1.7 1997/10/12 00:53:59 lukem Exp $	*/
 
 /*
  * Copyright (c) 1982, 1993
@@ -33,11 +33,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: init.c,v 1.6 1997/05/23 23:09:37 jtc Exp $";
+__RCSID("$NetBSD: init.c,v 1.7 1997/10/12 00:53:59 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -47,13 +48,14 @@ static char rcsid[] = "$NetBSD: init.c,v 1.6 1997/05/23 23:09:37 jtc Exp $";
  * @(#)init.c	1.1 (Berkeley) 4/1/82
  */
 
-init() {
+void
+init()
+{
+	PLAY	*pp;
+	int	i, j;
+	CARD	card;
 
-	register PLAY	*pp;
-	register int		i, j;
-	register CARD	card;
-
-	bzero(Numseen, sizeof Numseen);
+	memset(Numseen, 0, sizeof Numseen);
 	Numgos = 0;
 
 	for (i = 0; i < 2; i++) {
@@ -90,15 +92,16 @@ init() {
 	End = 700;
 }
 
-shuffle() {
-
-	register int		i, r;
-	register CARD	temp;
+void
+shuffle()
+{
+	int	i, r;
+	CARD	temp;
 
 	for (i = 0; i < DECK_SZ; i++) {
 		r = roll(1, DECK_SZ) - 1;
 		if (r < 0 || r > DECK_SZ - 1) {
-			fprintf(stderr, "shuffle: card no. error: %d\n", r);
+			warnx("shuffle: card no. error: %d", r);
 			die(1);
 		}
 		temp = Deck[r];
@@ -108,10 +111,11 @@ shuffle() {
 	Topcard = &Deck[DECK_SZ];
 }
 
-newboard() {
-
-	register int	i;
-	register PLAY	*pp;
+void
+newboard()
+{
+	int		i;
+	PLAY		*pp;
 	static int	first = TRUE;
 
 	if (first) {
@@ -166,10 +170,11 @@ newboard() {
 	newscore();
 }
 
-newscore() {
-
-	register int	i, new;
-	register PLAY	*pp;
+void
+newscore()
+{
+	int		i, new;
+	PLAY		*pp;
 	static int	was_full = -1;
 	static int	last_win = -1;
 

games/mille/mille.6

@@ -1,4 +1,4 @@
-.\"	$NetBSD: mille.6,v 1.5 1997/01/07 12:13:41 tls Exp $
+.\"	$NetBSD: mille.6,v 1.6 1997/10/12 00:54:03 lukem Exp $
 .\"
 .\" Copyright (c) 1983, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -38,7 +38,7 @@
 .SH NAME
 mille \- play Mille Bornes
 .SH SYNOPSIS
-.B /usr/games/mille
+.B mille
 [ file ]
 .SH DESCRIPTION
 .I Mille

games/mille/mille.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mille.c,v 1.5 1997/05/23 23:09:38 jtc Exp $	*/
+/*	$NetBSD: mille.c,v 1.6 1997/10/12 00:54:07 lukem Exp $	*/
 
 /*
  * Copyright (c) 1982, 1993
@@ -33,17 +33,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1982, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1982, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n");
 #endif /* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)mille.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: mille.c,v 1.5 1997/05/23 23:09:38 jtc Exp $";
+__RCSID("$NetBSD: mille.c,v 1.6 1997/10/12 00:54:07 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -57,13 +57,12 @@ static char rcsid[] = "$NetBSD: mille.c,v 1.5 1997/05/23 23:09:38 jtc Exp $";
  * @(#)mille.c	1.3 (Berkeley) 5/10/83
  */
 
-void	rub();
-
+int
 main(ac, av)
-register int	ac;
-register char	*av[];
+	int	ac;
+	char	*av[];
 {
-	register bool	restore;
+	bool	restore;
 
 	/* run as the user */
 	setuid(getuid());
@@ -146,8 +145,9 @@ register char	*av[];
  * quit.
  */
 void
-rub() {
-
+rub(dummy)
+	int dummy;
+{
 	(void)signal(SIGINT, SIG_IGN);
 	if (getyn(REALLYPROMPT))
 		die(0);
@@ -157,8 +157,10 @@ rub() {
 /*
  *	Time to go beddy-by
  */
+void
 die(code)
-int code; {
+	int code;
+{
 
 	(void)signal(SIGINT, SIG_IGN);
 	if (outf)

games/mille/mille.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: mille.h,v 1.6 1997/05/23 23:09:39 jtc Exp $	*/
+/*	$NetBSD: mille.h,v 1.7 1997/10/12 00:54:11 lukem Exp $	*/
 
 /*
  * Copyright (c) 1982, 1993
@@ -36,10 +36,17 @@
  */
 
 # include	<sys/types.h>
+# include	<sys/uio.h>
+# include	<sys/stat.h>
 # include	<ctype.h>
+# include	<err.h>
+# include	<errno.h>
 # include	<curses.h>
-# include	<termios.h>
+# include	<fcntl.h>
+# include	<stdlib.h>
 # include	<string.h>
+# include	<termios.h>
+# include	<unistd.h>
 
 /*
  * @(#)mille.h	1.1 (Berkeley) 4/1/82
@@ -218,4 +225,40 @@ extern WINDOW	*Board, *Miles, *Score;
  * functions
  */
 
-CARD	getcard();
+void	account __P((CARD));
+void	calcmove __P((void));
+int	canplay __P((PLAY *, PLAY *, CARD));
+int	check_ext __P((bool));
+void	check_go __P((void));
+void	check_more __P((void));
+void	die __P((int));
+void	domove __P((void));
+bool	error __P((char *, ...));
+void	extrapolate __P((PLAY *));
+void	finalscore __P((PLAY *));
+CARD	getcard __P((void));
+void	getmove __P((void));
+int	getyn __P((int));
+int	haspicked __P((PLAY *));
+void	init __P((void));
+int	isrepair __P((CARD));
+int	main __P((int, char **));
+void	newboard __P((void));
+void	newscore __P((void));
+int	onecard __P((PLAY *));
+int	playcard __P((PLAY *));
+void	prboard __P((void));
+void	prompt __P((int));
+void	prscore __P((int));
+int	readch __P((void));
+bool	rest_f __P((char *));
+int	roll __P((int, int));
+void	rub __P((int));
+int	safety __P((CARD));
+bool	save __P((void));
+void	show_card __P((int, int, CARD, CARD *));
+void	show_score __P((int, int, int, int *));
+void	shuffle __P((void));
+void	sort __P((CARD *));
+void	undoex __P((int));
+bool	varpush __P((int, ssize_t __P((int, const struct iovec *, int))));