PR/55693: Andreas Gustafsson: factor(6) lists factors in wrong order

[bsdgames-darwin.git] / hangman / getguess.c

diff --git a/hangman/getguess.c b/hangman/getguess.c
index ce08f882004550e3ea0fabe2690ceceb8ec33fa8..c4516c17f5e7bebc9b1c498bb6f374f8a0b6417a 100644 (file)
--- a/hangman/getguess.c
+++ b/hangman/getguess.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: getguess.c,v 1.6 1997/05/23 23:27:40 jtc Exp $ */
+/*     $NetBSD: getguess.c,v 1.10 2012/10/13 21:01:13 dholland Exp $   */
 
 /*
  * Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -33,11 +29,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)getguess.c 8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: getguess.c,v 1.6 1997/05/23 23:27:40 jtc Exp $";
+__RCSID("$NetBSD: getguess.c,v 1.10 2012/10/13 21:01:13 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -48,11 +45,12 @@ static char rcsid[] = "$NetBSD: getguess.c,v 1.6 1997/05/23 23:27:40 jtc Exp $";
  * getguess:
  *     Get another guess
  */
-getguess()
+void
+getguess(void)
 {
-       register int    i;
-       register int    ch;
-       register bool   correct;
+       int i;
+       int ch;
+       bool correct;
 
        leaveok(stdscr, FALSE);
        for (;;) {
@@ -63,51 +61,50 @@ getguess()
                        if (isupper(ch))
                                ch = tolower(ch);
                        if (Guessed[ch - 'a'])
-                               mvprintw(MESGY, MESGX, "Already guessed '%c'", ch);
+                               mvprintw(MESGY, MESGX, "Already guessed '%c'",
+                                   ch);
                        else
                                break;
-               }
-               else if (ch == CTRL('D'))
-                       die();
-               else
-                       mvprintw(MESGY, MESGX, "Not a valid guess: '%s'",
-                               unctrl(ch));
+               } else
+                       if (ch == CTRL('D'))
+                               die(0);
+                       else
+                               mvprintw(MESGY, MESGX,
+                                   "Not a valid guess: '%s'", unctrl(ch));
        }
        leaveok(stdscr, TRUE);
        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++;
 }
-
 /*
  * readch;
  *     Read a character from the input
  */
-readch()
+int
+readch(void)
 {
-       register int    cnt, r;
-       auto char       ch;
+       int cnt;
+       char ch;
 
        cnt = 0;
        for (;;) {
-               if (read(0, &ch, sizeof ch) <= 0)
-               {
+               if (read(0, &ch, sizeof ch) <= 0) {
                        if (++cnt > 100)
-                               die();
-               }
-               else if (ch == CTRL('L')) {
-                       wrefresh(curscr);
-               }
-               else
-                       return ch;
+                               die(0);
+               } else
+                       if (ch == CTRL('L')) {
+                               wrefresh(curscr);
+                       } else
+                               return ch;
        }
 }