Module Name: src
Committed By: dholland
Date: Sat Oct 13 21:01:13 UTC 2012
Modified Files:
src/games/hangman: getguess.c playgame.c
Log Message:
Pass -Wstrict-overflow; while here, use curses TRUE and FALSE only with
curses.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/games/hangman/getguess.c
cvs rdiff -u -r1.6 -r1.7 src/games/hangman/playgame.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/hangman/getguess.c
diff -u src/games/hangman/getguess.c:1.9 src/games/hangman/getguess.c:1.10
--- src/games/hangman/getguess.c:1.9 Tue Jun 19 05:45:00 2012
+++ src/games/hangman/getguess.c Sat Oct 13 21:01:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: getguess.c,v 1.9 2012/06/19 05:45:00 dholland Exp $ */
+/* $NetBSD: getguess.c,v 1.10 2012/10/13 21:01:13 dholland Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getguess.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: getguess.c,v 1.9 2012/06/19 05:45:00 dholland Exp $");
+__RCSID("$NetBSD: getguess.c,v 1.10 2012/10/13 21:01:13 dholland Exp $");
#endif
#endif /* not lint */
@@ -76,12 +76,12 @@ getguess(void)
move(MESGY, MESGX);
clrtoeol();
- Guessed[ch - 'a'] = TRUE;
- correct = FALSE;
+ Guessed[ch - 'a'] = true;
+ correct = false;
for (i = 0; Word[i] != '\0'; i++)
if (Word[i] == ch) {
Known[i] = ch;
- correct = TRUE;
+ correct = true;
}
if (!correct)
Errors++;
Index: src/games/hangman/playgame.c
diff -u src/games/hangman/playgame.c:1.6 src/games/hangman/playgame.c:1.7
--- src/games/hangman/playgame.c:1.6 Tue Jun 19 05:45:00 2012
+++ src/games/hangman/playgame.c Sat Oct 13 21:01:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: playgame.c,v 1.6 2012/06/19 05:45:00 dholland Exp $ */
+/* $NetBSD: playgame.c,v 1.7 2012/10/13 21:01:13 dholland Exp $ */
/*-
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)playgame.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: playgame.c,v 1.6 2012/06/19 05:45:00 dholland Exp $");
+__RCSID("$NetBSD: playgame.c,v 1.7 2012/10/13 21:01:13 dholland Exp $");
#endif
#endif /* not lint */
@@ -47,13 +47,13 @@ __RCSID("$NetBSD: playgame.c,v 1.6 2012/
void
playgame(void)
{
- bool *bp;
+ int i;
getword();
Errors = 0;
- bp = Guessed;
- while (bp < &Guessed[26])
- *bp++ = FALSE;
+ for (i=0; i<26; i++) {
+ Guessed[i] = false;
+ }
while (Errors < MAXERRS && strchr(Known, '-') != NULL) {
prword();
prdata();