Silence some compiler warnings

--HG--
branch : 1.7

diff --git a/getdate.c b/getdate.c
index 607b4c95e981d21bb4feec3aa87173280d859373..a2711ccd43a6b732fd66a9339fdb3426f4a881b5 100644 (file)
--- a/getdate.c
+++ b/getdate.c
@@ -1,11 +1,3 @@
-#ifndef lint
-/*static char yysccsid[] = "from: @(#)yaccpar  1.9 (Berkeley) 02/21/93";*/
-static char yyrcsid[]
-#if __GNUC__ >= 2
-  __attribute__ ((unused))
-#endif /* __GNUC__ >= 2 */
-  = "$OpenBSD: skeleton.c,v 1.29 2008/07/08 15:06:50 otto Exp $";
-#endif
 #include <stdlib.h>
 #include <string.h>
 #define YYBYACC 1
@@ -122,7 +114,7 @@ static int  yyerror __P((char *s));
 static int     yylex __P((void));
 static int     yyparse __P((void));
 
-#line 106 "getdate.y"
+#line 108 "getdate.y"
 #ifndef YYSTYPE_DEFINED
 #define YYSTYPE_DEFINED
 typedef union {
@@ -130,7 +122,7 @@ typedef union {
     enum _MERIDIAN     Meridian;
 } YYSTYPE;
 #endif /* YYSTYPE_DEFINED */
-#line 132 "y.tab.c"
+#line 126 "y.tab.c"
 #define tAGO 257
 #define tDAY 258
 #define tDAYZONE 259
@@ -398,7 +390,7 @@ short *yyss;
 short *yysslim;
 YYSTYPE *yyvs;
 int yystacksize;
-#line 325 "getdate.y"
+#line 327 "getdate.y"
 
 /* Month and day table. */
 static TABLE const MonthDayTable[] = {
@@ -751,7 +743,7 @@ LookupWord(buff)
 
     /* Make it lowercase. */
     for (p = buff; *p; p++)
-       if (isupper(*p))
+       if (isupper((unsigned char)*p))
            *p = tolower(*p);
 
     if (strcmp(buff, "am") == 0 || strcmp(buff, "a.m.") == 0) {
@@ -820,7 +812,7 @@ LookupWord(buff)
        }
 
     /* Military timezones. */
-    if (buff[1] == '\0' && isalpha(*buff)) {
+    if (buff[1] == '\0' && isalpha((unsigned char)*buff)) {
        for (tp = MilitaryTable; tp->name; tp++)
            if (strcmp(buff, tp->name) == 0) {
                yylval.Number = tp->value;
@@ -856,27 +848,27 @@ yylex()
     int                        sign;
 
     for ( ; ; ) {
-       while (isspace(*yyInput))
+       while (isspace((unsigned char)*yyInput))
            yyInput++;
 
-       if (isdigit(c = *yyInput) || c == '-' || c == '+') {
+       if (isdigit((unsigned char)(c = *yyInput)) || c == '-' || c == '+') {
            if (c == '-' || c == '+') {
                sign = c == '-' ? -1 : 1;
-               if (!isdigit(*++yyInput))
+               if (!isdigit((unsigned char)*++yyInput))
                    /* skip the '-' sign */
                    continue;
            }
            else
                sign = 0;
-           for (yylval.Number = 0; isdigit(c = *yyInput++); )
+           for (yylval.Number = 0; isdigit((unsigned char)(c = *yyInput++)); )
                yylval.Number = 10 * yylval.Number + c - '0';
            yyInput--;
            if (sign < 0)
                yylval.Number = -yylval.Number;
            return sign ? tSNUMBER : tUNUMBER;
        }
-       if (isalpha(c)) {
-           for (p = buff; isalpha(c = *yyInput++) || c == '.'; )
+       if (isalpha((unsigned char)c)) {
+           for (p = buff; isalpha((unsigned char)(c = *yyInput++)) || c == '.'; )
                if (p < &buff[sizeof buff - 1])
                    *p++ = c;
            *p = '\0';
@@ -1040,7 +1032,7 @@ main(ac, av)
     /* NOTREACHED */
 }
 #endif /* defined(TEST) */
-#line 990 "y.tab.c"
+#line 984 "y.tab.c"
 /* allocate initial stack or double stack size, up to YYMAXDEPTH */
 #if defined(__cplusplus) || defined(__STDC__)
 static int yygrowstack(void)
@@ -1246,37 +1238,37 @@ yyreduce:
     switch (yyn)
     {
 case 3:
-#line 124 "getdate.y"
+#line 126 "getdate.y"
 {
            yyHaveTime++;
        }
 break;
 case 4:
-#line 127 "getdate.y"
+#line 129 "getdate.y"
 {
            yyHaveZone++;
        }
 break;
 case 5:
-#line 130 "getdate.y"
+#line 132 "getdate.y"
 {
            yyHaveDate++;
        }
 break;
 case 6:
-#line 133 "getdate.y"
+#line 135 "getdate.y"
 {
            yyHaveDay++;
        }
 break;
 case 7:
-#line 136 "getdate.y"
+#line 138 "getdate.y"
 {
            yyHaveRel++;
        }
 break;
 case 9:
-#line 142 "getdate.y"
+#line 144 "getdate.y"
 {
            yyHour = yyvsp[-1].Number;
            yyMinutes = 0;
@@ -1285,7 +1277,7 @@ case 9:
        }
 break;
 case 10:
-#line 148 "getdate.y"
+#line 150 "getdate.y"
 {
            yyHour = yyvsp[-3].Number;
            yyMinutes = yyvsp[-1].Number;
@@ -1294,7 +1286,7 @@ case 10:
        }
 break;
 case 11:
-#line 154 "getdate.y"
+#line 156 "getdate.y"
 {
            yyHour = yyvsp[-3].Number;
            yyMinutes = yyvsp[-1].Number;
@@ -1304,7 +1296,7 @@ case 11:
        }
 break;
 case 12:
-#line 161 "getdate.y"
+#line 163 "getdate.y"
 {
            yyHour = yyvsp[-5].Number;
            yyMinutes = yyvsp[-3].Number;
@@ -1313,7 +1305,7 @@ case 12:
        }
 break;
 case 13:
-#line 167 "getdate.y"
+#line 169 "getdate.y"
 {
            yyHour = yyvsp[-5].Number;
            yyMinutes = yyvsp[-3].Number;
@@ -1324,56 +1316,56 @@ case 13:
        }
 break;
 case 14:
-#line 177 "getdate.y"
+#line 179 "getdate.y"
 {
            yyTimezone = yyvsp[0].Number;
            yyDSTmode = DSToff;
        }
 break;
 case 15:
-#line 181 "getdate.y"
+#line 183 "getdate.y"
 {
            yyTimezone = yyvsp[0].Number;
            yyDSTmode = DSTon;
        }
 break;
 case 16:
-#line 186 "getdate.y"
+#line 188 "getdate.y"
 {
            yyTimezone = yyvsp[-1].Number;
            yyDSTmode = DSTon;
        }
 break;
 case 17:
-#line 192 "getdate.y"
+#line 194 "getdate.y"
 {
            yyDayOrdinal = 1;
            yyDayNumber = yyvsp[0].Number;
        }
 break;
 case 18:
-#line 196 "getdate.y"
+#line 198 "getdate.y"
 {
            yyDayOrdinal = 1;
            yyDayNumber = yyvsp[-1].Number;
        }
 break;
 case 19:
-#line 200 "getdate.y"
+#line 202 "getdate.y"
 {
            yyDayOrdinal = yyvsp[-1].Number;
            yyDayNumber = yyvsp[0].Number;
        }
 break;
 case 20:
-#line 206 "getdate.y"
+#line 208 "getdate.y"
 {
            yyMonth = yyvsp[-2].Number;
            yyDay = yyvsp[0].Number;
        }
 break;
 case 21:
-#line 210 "getdate.y"
+#line 212 "getdate.y"
 {
            if (yyvsp[-4].Number >= 100) {
                yyYear = yyvsp[-4].Number;
@@ -1387,7 +1379,7 @@ case 21:
        }
 break;
 case 22:
-#line 221 "getdate.y"
+#line 223 "getdate.y"
 {
            /* ISO 8601 format.  yyyy-mm-dd.  */
            yyYear = yyvsp[-2].Number;
@@ -1396,7 +1388,7 @@ case 22:
        }
 break;
 case 23:
-#line 227 "getdate.y"
+#line 229 "getdate.y"
 {
            /* e.g. 17-JUN-1992.  */
            yyDay = yyvsp[-2].Number;
@@ -1405,14 +1397,14 @@ case 23:
        }
 break;
 case 24:
-#line 233 "getdate.y"
+#line 235 "getdate.y"
 {
            yyMonth = yyvsp[-1].Number;
            yyDay = yyvsp[0].Number;
        }
 break;
 case 25:
-#line 237 "getdate.y"
+#line 239 "getdate.y"
 {
            yyMonth = yyvsp[-3].Number;
            yyDay = yyvsp[-2].Number;
@@ -1420,14 +1412,14 @@ case 25:
        }
 break;
 case 26:
-#line 242 "getdate.y"
+#line 244 "getdate.y"
 {
            yyMonth = yyvsp[0].Number;
            yyDay = yyvsp[-1].Number;
        }
 break;
 case 27:
-#line 246 "getdate.y"
+#line 248 "getdate.y"
 {
            yyMonth = yyvsp[-1].Number;
            yyDay = yyvsp[-2].Number;
@@ -1435,68 +1427,68 @@ case 27:
        }
 break;
 case 28:
-#line 253 "getdate.y"
+#line 255 "getdate.y"
 {
            yyRelSeconds = -yyRelSeconds;
            yyRelMonth = -yyRelMonth;
        }
 break;
 case 30:
-#line 260 "getdate.y"
+#line 262 "getdate.y"
 {
            yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L;
        }
 break;
 case 31:
-#line 263 "getdate.y"
+#line 265 "getdate.y"
 {
            yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L;
        }
 break;
 case 32:
-#line 266 "getdate.y"
+#line 268 "getdate.y"
 {
            yyRelSeconds += yyvsp[0].Number * 60L;
        }
 break;
 case 33:
-#line 269 "getdate.y"
+#line 271 "getdate.y"
 {
            yyRelSeconds += yyvsp[-1].Number;
        }
 break;
 case 34:
-#line 272 "getdate.y"
+#line 274 "getdate.y"
 {
            yyRelSeconds += yyvsp[-1].Number;
        }
 break;
 case 35:
-#line 275 "getdate.y"
+#line 277 "getdate.y"
 {
            yyRelSeconds++;
        }
 break;
 case 36:
-#line 278 "getdate.y"
+#line 280 "getdate.y"
 {
            yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
        }
 break;
 case 37:
-#line 281 "getdate.y"
+#line 283 "getdate.y"
 {
            yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
        }
 break;
 case 38:
-#line 284 "getdate.y"
+#line 286 "getdate.y"
 {
            yyRelMonth += yyvsp[0].Number;
        }
 break;
 case 39:
-#line 289 "getdate.y"
+#line 291 "getdate.y"
 {
            if (yyHaveTime && yyHaveDate && !yyHaveRel)
                yyYear = yyvsp[0].Number;
@@ -1524,18 +1516,18 @@ case 39:
        }
 break;
 case 40:
-#line 316 "getdate.y"
+#line 318 "getdate.y"
 {
            yyval.Meridian = MER24;
        }
 break;
 case 41:
-#line 319 "getdate.y"
+#line 321 "getdate.y"
 {
            yyval.Meridian = yyvsp[0].Meridian;
        }
 break;
-#line 1485 "y.tab.c"
+#line 1479 "y.tab.c"
     }
     yyssp -= yym;
     yystate = *yyssp;

diff --git a/getdate.y b/getdate.y
index 00fec6a5977b72b8d23319c1172d62c0fd99ffce..af067f59249435edd00fe45bf81e5f19d6435f76 100644 (file)
--- a/getdate.y
+++ b/getdate.y
@@ -676,7 +676,7 @@ LookupWord(buff)
 
     /* Make it lowercase. */
     for (p = buff; *p; p++)
-       if (isupper(*p))
+       if (isupper((unsigned char)*p))
            *p = tolower(*p);
 
     if (strcmp(buff, "am") == 0 || strcmp(buff, "a.m.") == 0) {
@@ -745,7 +745,7 @@ LookupWord(buff)
        }
 
     /* Military timezones. */
-    if (buff[1] == '\0' && isalpha(*buff)) {
+    if (buff[1] == '\0' && isalpha((unsigned char)*buff)) {
        for (tp = MilitaryTable; tp->name; tp++)
            if (strcmp(buff, tp->name) == 0) {
                yylval.Number = tp->value;
@@ -781,27 +781,27 @@ yylex()
     int                        sign;
 
     for ( ; ; ) {
-       while (isspace(*yyInput))
+       while (isspace((unsigned char)*yyInput))
            yyInput++;
 
-       if (isdigit(c = *yyInput) || c == '-' || c == '+') {
+       if (isdigit((unsigned char)(c = *yyInput)) || c == '-' || c == '+') {
            if (c == '-' || c == '+') {
                sign = c == '-' ? -1 : 1;
-               if (!isdigit(*++yyInput))
+               if (!isdigit((unsigned char)*++yyInput))
                    /* skip the '-' sign */
                    continue;
            }
            else
                sign = 0;
-           for (yylval.Number = 0; isdigit(c = *yyInput++); )
+           for (yylval.Number = 0; isdigit((unsigned char)(c = *yyInput++)); )
                yylval.Number = 10 * yylval.Number + c - '0';
            yyInput--;
            if (sign < 0)
                yylval.Number = -yylval.Number;
            return sign ? tSNUMBER : tUNUMBER;
        }
-       if (isalpha(c)) {
-           for (p = buff; isalpha(c = *yyInput++) || c == '.'; )
+       if (isalpha((unsigned char)c)) {
+           for (p = buff; isalpha((unsigned char)(c = *yyInput++)) || c == '.'; )
                if (p < &buff[sizeof buff - 1])
                    *p++ = c;
            *p = '\0';

diff --git a/ldap.c b/ldap.c
index befd5fd556a4a7054ac18c85199e7d87b647d45b..c2e656cfd5d0a548aea47f718099b4e3e58584ac 100644 (file)
--- a/ldap.c
+++ b/ldap.c
@@ -269,7 +269,8 @@ sudo_ldap_conf_add_ports()
        if (strlcat(hostbuf, host, sizeof(hostbuf)) >= sizeof(hostbuf))
            goto toobig;
        /* Append port if there is not one already. */
-       if ((port = strrchr(host, ':')) == NULL || !isdigit(port[1])) {
+       if ((port = strrchr(host, ':')) == NULL ||
+           !isdigit((unsigned char)port[1])) {
            if (strlcat(hostbuf, defport, sizeof(hostbuf)) >= sizeof(hostbuf))
                goto toobig;
        }
@@ -331,7 +332,8 @@ sudo_ldap_parse_uri(uri_list)
 
        /* If using SSL and no port specified, add port 636 */
        if (nldaps) {
-           if ((port = strrchr(host, ':')) == NULL || !isdigit(port[1]))
+           if ((port = strrchr(host, ':')) == NULL ||
+               !isdigit((unsigned char)port[1]))
                if (strlcat(hostbuf, ":636", sizeof(hostbuf)) >= sizeof(hostbuf))
                    goto toobig;
        }
@@ -1575,9 +1577,11 @@ sudo_ldap_bind_s(ld)
     LDAP *ld;
 {
     int rc;
+#ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S
     const char *old_ccname = user_ccname;
-#ifdef HAVE_GSS_KRB5_CCACHE_NAME
+# ifdef HAVE_GSS_KRB5_CCACHE_NAME
     unsigned int status;
+# endif
 #endif
 
 #ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S
@@ -1587,28 +1591,28 @@ sudo_ldap_bind_s(ld)
            ldap_conf.rootsasl_auth_id : ldap_conf.sasl_auth_id;
 
        if (ldap_conf.krb5_ccname != NULL) {
-#ifdef HAVE_GSS_KRB5_CCACHE_NAME
+# ifdef HAVE_GSS_KRB5_CCACHE_NAME
            if (gss_krb5_ccache_name(&status, ldap_conf.krb5_ccname, &old_ccname)
                != GSS_S_COMPLETE) {
                old_ccname = NULL;
                DPRINTF(("gss_krb5_ccache_name() failed: %d", status), 1);
            }
-#else
+# else
            setenv("KRB5CCNAME", ldap_conf.krb5_ccname, TRUE);
-#endif
+# endif
        }
        rc = ldap_sasl_interactive_bind_s(ld, ldap_conf.binddn, "GSSAPI",
            NULL, NULL, LDAP_SASL_QUIET, sudo_ldap_sasl_interact, auth_id);
        if (ldap_conf.krb5_ccname != NULL) {
-#ifdef HAVE_GSS_KRB5_CCACHE_NAME
+# ifdef HAVE_GSS_KRB5_CCACHE_NAME
            if (gss_krb5_ccache_name(&status, old_ccname, NULL) != GSS_S_COMPLETE)
                    DPRINTF(("gss_krb5_ccache_name() failed: %d", status), 1);
-#else
+# else
            if (old_ccname != NULL)
                setenv("KRB5CCNAME", old_ccname, TRUE);
            else
                unsetenv("KRB5CCNAME");
-#endif
+# endif
        }
        if (rc != LDAP_SUCCESS) {
            warningx("ldap_sasl_interactive_bind_s(): %s", ldap_err2string(rc));

diff --git a/sudoreplay.c b/sudoreplay.c
index 855975b0c0013bb60aa89141ad6f9b505f84e56b..61b2cecaffcd87900be766749c89bd6791cedc01 100644 (file)
--- a/sudoreplay.c
+++ b/sudoreplay.c
@@ -167,8 +167,10 @@ static void usage __P((void));
 # define REGEX_T       char
 #endif
 
-#define VALID_ID(s) (isalnum((s)[0]) && isalnum((s)[1]) && isalnum((s)[2]) && \
-    isalnum((s)[3]) && isalnum((s)[4]) && isalnum((s)[5]) && (s)[6] == '\0')
+#define VALID_ID(s) (isalnum((unsigned char)(s)[0]) && \
+    isalnum((unsigned char)(s)[1]) && isalnum((unsigned char)(s)[2]) && \
+    isalnum((unsigned char)(s)[3]) && isalnum((unsigned char)(s)[4]) && \
+    isalnum((unsigned char)(s)[5]) && (s)[6] == '\0')
 
 int
 main(argc, argv)
@@ -606,8 +608,8 @@ list_session_dir(pathbuf, re, user, tty)
        return(-1);
     }
     while ((dp = readdir(d)) != NULL) {
-       if (NAMLEN(dp) != 2 || !isalnum(dp->d_name[0]) ||
-           !isalnum(dp->d_name[1]))
+       if (NAMLEN(dp) != 2 || !isalnum((unsigned char)dp->d_name[0]) ||
+           !isalnum((unsigned char)dp->d_name[1]))
            continue;
 
        /* open log file, print id and command */
@@ -734,8 +736,8 @@ list_sessions(argc, argv, pattern, user, tty)
      * We do a depth-first traversal.
      */
     while ((dp1 = readdir(d1)) != NULL) {
-       if (NAMLEN(dp1) != 2 || !isalnum(dp1->d_name[0]) ||
-           !isalnum(dp1->d_name[1]))
+       if (NAMLEN(dp1) != 2 || !isalnum((unsigned char)dp1->d_name[0]) ||
+           !isalnum((unsigned char)dp1->d_name[1]))
            continue;
 
        pathbuf[sdlen + 0] = '/';
@@ -747,8 +749,8 @@ list_sessions(argc, argv, pattern, user, tty)
            continue;
 
        while ((dp2 = readdir(d2)) != NULL) {
-           if (NAMLEN(dp2) != 2 || !isalnum(dp2->d_name[0]) ||
-               !isalnum(dp2->d_name[1]))
+           if (NAMLEN(dp2) != 2 || !isalnum((unsigned char)dp2->d_name[0]) ||
+               !isalnum((unsigned char)dp2->d_name[1]))
                continue;
 
            pathbuf[sdlen + 3] = '/';