more clarifications.

[bsdgames-darwin.git] / mille / misc.c

diff --git a/mille/misc.c b/mille/misc.c
index 2fcd9379aba17af92340083999bce391d51e3fb4..bccec8892ab09cfa260d4bb1cb31f4578e716c4e 100644 (file)
--- a/mille/misc.c
+++ b/mille/misc.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: misc.c,v 1.6 1997/10/12 00:54:16 lukem Exp $   */
+/*     $NetBSD: misc.c,v 1.12 2009/05/25 23:24:54 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.
  *
@@ -38,18 +34,14 @@
 #if 0
 static char sccsid[] = "@(#)misc.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: misc.c,v 1.6 1997/10/12 00:54:16 lukem Exp $");
+__RCSID("$NetBSD: misc.c,v 1.12 2009/05/25 23:24:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
 #include <sys/file.h>
 #include <termios.h>
 
-#if __STDC__
-#include       <stdarg.h>
-#else
-#include       <varargs.h>
-#endif
+#include <stdarg.h>
 
 #include       "mille.h"
 #ifndef        unctrl
@@ -57,10 +49,6 @@ __RCSID("$NetBSD: misc.c,v 1.6 1997/10/12 00:54:16 lukem Exp $");
 #endif
 
 
-# ifdef        attron
-#      include <term.h>
-# endif        attron
-
 /*
  * @(#)misc.c  1.2 (Berkeley) 3/28/83
  */
@@ -68,24 +56,14 @@ __RCSID("$NetBSD: misc.c,v 1.6 1997/10/12 00:54:16 lukem Exp $");
 #define        NUMSAFE 4
 
 bool
-#if __STDC__
-error(char *str, ...)
-#else
-error(str, va_alist)
-       char    *str;
-       va_dcl
-#endif
+error(const char *str, ...)
 {
        va_list ap;
 
-#if __STDC__
        va_start(ap, str);
-#else
-       va_start(ap);
-#endif
        wmove(Score, ERR_Y, ERR_X);
        vwprintw(Score, str, ap);
-       clrtoeol();
+       wclrtoeol(Score);
        putchar('\07');
        refresh();
        va_end(ap);
@@ -93,7 +71,7 @@ error(str, va_alist)
 }
 
 CARD
-getcard()
+getcard(void)
 {
        int     c, c1;
 
@@ -142,8 +120,7 @@ cont:               ;
 }
 
 int
-check_ext(forcomp)
-       bool    forcomp;
+check_ext(bool forcomp)
 {
 
 
@@ -198,8 +175,7 @@ done:
  * also allowed.  Return TRUE if the answer was yes, FALSE if no.
  */
 int
-getyn(promptno)
-       int     promptno;
+getyn(int promptno)
 {
        char    c;
 
@@ -243,7 +219,7 @@ getyn(promptno)
  * it.  Exit appropriately.
  */
 void
-check_more()
+check_more(void)
 {
        On_exit = TRUE;
        if (Player[PLAYER].total >= 5000 || Player[COMP].total >= 5000)
@@ -270,7 +246,7 @@ check_more()
 }
 
 int
-readch()
+readch(void)
 {
        int     cnt;
        static char     c;