Add (unsigned char) cast to ctype functions

[bsdgames-darwin.git] / dm / dm.c

diff --git a/dm/dm.c b/dm/dm.c
index da31a248f93115317f5287961a6b3859ac686278..c131904a81951f3e77510f7a294caa299fd889fb 100644 (file)
--- a/dm/dm.c
+++ b/dm/dm.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: dm.c,v 1.17 2002/08/02 03:06:24 christos Exp $ */
+/*     $NetBSD: dm.c,v 1.21 2004/11/05 21:30:32 dsl Exp $      */

 
 /*
  * Copyright (c) 1987, 1993
 
 /*
  * Copyright (c) 1987, 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.
  * 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.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
 #if 0
 static char sccsid[] = "@(#)dm.c       8.1 (Berkeley) 5/31/93";
 #else
 #if 0
 static char sccsid[] = "@(#)dm.c       8.1 (Berkeley) 5/31/93";
 #else

-__RCSID("$NetBSD: dm.c,v 1.17 2002/08/02 03:06:24 christos Exp $");
+__RCSID("$NetBSD: dm.c,v 1.21 2004/11/05 21:30:32 dsl Exp $");

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -70,20 +66,20 @@ static int  priority = 0;           /* priority game runs at */
 static char    *game,                  /* requested game */
                *gametty;               /* from tty? */
 
 static char    *game,                  /* requested game */
                *gametty;               /* from tty? */
 

-void   c_day __P((const char *, const char *, const char *));
-void   c_game __P((const char *, const char  *, const char *, const char *));
-void   c_tty __P((const char *));
-const char *hour __P((int));
-double load __P((void));
-int    main __P((int, char *[]));
-void   nogamefile __P((void));
-void   play __P((char **)) __attribute__((__noreturn__));
-void   read_config __P((void));
-int    users __P((void));
+void   c_day(const char *, const char *, const char *);
+void   c_game(const char *, const char  *, const char *, const char *);
+void   c_tty(const char *);
+const char *hour(int);
+double load(void);
+int    main(int, char *[]);
+void   nogamefile(void);
+void   play(char **) __attribute__((__noreturn__));
+void   read_config(void);
+int    users(void);

 
 int
 main(argc, argv)
 
 int
 main(argc, argv)

-       int argc;
+       int argc __attribute__((__unused__));

        char *argv[];
 {
        char *cp;
        char *argv[];
 {
        char *cp;


@@ -177,7 +173,7 @@ c_day(s_day, s_start, s_stop)
                ct = localtime(&now);
        if (strcasecmp(s_day, days[ct->tm_wday]))
                return;
                ct = localtime(&now);
        if (strcasecmp(s_day, days[ct->tm_wday]))
                return;

-       if (!isdigit(*s_start) || !isdigit(*s_stop))
+       if (!isdigit((unsigned char)*s_start) || !isdigit((unsigned char)*s_stop))

                return;
        start = atoi(s_start);
        stop = atoi(s_stop);
                return;
        start = atoi(s_start);
        stop = atoi(s_stop);


@@ -225,11 +221,11 @@ c_game(s_game, s_load, s_users, s_priority)
        if (strcmp(game, s_game) && strcasecmp("default", s_game))
                return;
        ++found;
        if (strcmp(game, s_game) && strcasecmp("default", s_game))
                return;
        ++found;

-       if (isdigit(*s_load) && atoi(s_load) < load())
+       if (isdigit((unsigned char)*s_load) && atoi(s_load) < load())

                errx(0, "Sorry, the load average is too high right now.");
                errx(0, "Sorry, the load average is too high right now.");

-       if (isdigit(*s_users) && atoi(s_users) <= users())
+       if (isdigit((unsigned char)*s_users) && atoi(s_users) <= users())

                errx(0, "Sorry, there are too many users logged on right now.");
                errx(0, "Sorry, there are too many users logged on right now.");

-       if (isdigit(*s_priority))
+       if (isdigit((unsigned char)*s_priority))

                priority = atoi(s_priority);
 }
 
                priority = atoi(s_priority);
 }