From: dholland Date: Sat, 13 Oct 2012 21:01:13 +0000 (+0000) Subject: Pass -Wstrict-overflow; while here, use curses TRUE and FALSE only with X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/commitdiff_plain/b28859492eef9545fab9fa13e43f151a2206b114?hp=c8cd2374db6fe8db6f4149ff6f9afdae32fe2473 Pass -Wstrict-overflow; while here, use curses TRUE and FALSE only with curses. --- diff --git a/hangman/getguess.c b/hangman/getguess.c index 691c60e4..c4516c17 100644 --- a/hangman/getguess.c +++ b/hangman/getguess.c @@ -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++; diff --git a/hangman/playgame.c b/hangman/playgame.c index 12b5d858..f18923d8 100644 --- a/hangman/playgame.c +++ b/hangman/playgame.c @@ -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/06/19 05:45:00 dholland Exp $"); 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();