Jumbo fix to quiet compiler warnings by adding (int) cast to

	chars for comparison.  Submitted by Jason Ornstein.

diff --git a/src/lib/dict.c b/src/lib/dict.c
index 3f18e4e..c79ada3 100644 (file)
--- a/src/lib/dict.c
+++ b/src/lib/dict.c
@@ -343,7 +343,7 @@ static int my_dict_init(const char *dir, const char *fn, const char *src_file, i
                        /*
                         *      Validate all entries
                         */
-                       if (!isdigit(*valstr)) {
+                       if (!isdigit((int) *valstr)) {
                                librad_log("dict_init: %s[%d]: invalid value",
                                        fn, line);
                                return -1;
@@ -469,7 +469,7 @@ static int my_dict_init(const char *dir, const char *fn, const char *src_file, i
                        /*
                         *      Validate all entries
                         */
-                       if (!isdigit(*valstr)) {
+                       if (!isdigit((int) *valstr)) {
                                librad_log("dict_init: %s[%d]: invalid value",
                                        fn, line);
                                return -1;
@@ -515,7 +515,7 @@ static int my_dict_init(const char *dir, const char *fn, const char *src_file, i
                        /*
                         *       Validate all entries
                         */
-                       if (!isdigit(*valstr)) {
+                       if (!isdigit((int) *valstr)) {
                                librad_log("dict_init: %s[%d]: invalid value",
                                        fn, line);
                                return -1;

diff --git a/src/lib/filters.c b/src/lib/filters.c
index 5656aa7..c670c21 100644 (file)
--- a/src/lib/filters.c
+++ b/src/lib/filters.c
@@ -390,8 +390,8 @@ int findKey(const char *string, const KeywordStruct *list)
 
     len = strlen( string );
     for( ptr = buf ; len; len--, string++ ) {
-       if( isupper( *string ) ) {
-           *ptr++ = tolower( *string );
+       if( isupper( (int) *string ) ) {
+           *ptr++ = tolower( (int) *string );
        } else {
            *ptr++ = *string;
        }
@@ -425,7 +425,7 @@ isAllDigit(const char *token)
 
     i = strlen( token );
     while( i-- ) {
-       if( isdigit( *token ) ) {
+       if( isdigit( (int) *token ) ) {
            token++;
        } else {
            break;
@@ -472,7 +472,7 @@ a2octet(const char *tok, char *retBuf)
            if( *tok <= '9' && *tok >= '0' ) {
                val = '0';
                *octet++ = *tok++ - val;
-           } else if( isxdigit( *tok ) ) {
+           } else if( isxdigit( (int) *tok ) ) {
                if( *tok > 'Z' ) {
                    val = 'a';
                } else {

diff --git a/src/lib/misc.c b/src/lib/misc.c
index e1c6fc0..07b4c09 100644 (file)
--- a/src/lib/misc.c
+++ b/src/lib/misc.c
@@ -165,7 +165,7 @@ void rad_lowercase(char *str) {
        char *s;
 
        for (s=str; *s; s++)
-               if (isupper(*s)) *s = tolower(*s);
+               if (isupper((int) *s)) *s = tolower((int) *s);
 }
 
 /*
@@ -176,7 +176,7 @@ void rad_rmspace(char *str) {
        char *ptr = str;
 
   while(ptr && *ptr!='\0') {
-    while(isspace(*ptr))
+    while(isspace((int) *ptr))
       ptr++;
     *s = *ptr;
     ptr++;

diff --git a/src/lib/snprintf.c b/src/lib/snprintf.c
index 56c6cfa..f2a2a68 100644 (file)
--- a/src/lib/snprintf.c
+++ b/src/lib/snprintf.c
@@ -166,7 +166,7 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
       }
       break;
     case DP_S_MIN:
-      if (isdigit((unsigned char)ch)) 
+      if (isdigit((int)ch)) 
       {
        min = 10*min + char_to_int (ch);
        ch = *format++;
@@ -190,7 +190,7 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
        state = DP_S_MOD;
       break;
     case DP_S_MAX:
-      if (isdigit((unsigned char)ch)) 
+      if (isdigit((int)ch)) 
       {
        if (max < 0)
          max = 0;

diff --git a/src/lib/token.c b/src/lib/token.c
index 8b0e627..5851a7e 100644 (file)
--- a/src/lib/token.c
+++ b/src/lib/token.c
@@ -72,7 +72,7 @@ static LRAD_TOKEN getthing(char **ptr, char *buf, int buflen, int tok,
 
        /* Skip whitespace */
        p = *ptr;
-       while (*p && isspace(*p))
+       while (*p && isspace((int) *p))
                p++;
 
        if (*p == 0) {
@@ -87,7 +87,7 @@ static LRAD_TOKEN getthing(char **ptr, char *buf, int buflen, int tok,
                if (TOKEN_MATCH(p, t->str)) {
                        strcpy(buf, t->str);
                        p += strlen(t->str);
-                       while (isspace(*p))
+                       while (isspace((int) *p))
                                p++;
                        *ptr = p;
                        return t->token;
@@ -141,7 +141,7 @@ static LRAD_TOKEN getthing(char **ptr, char *buf, int buflen, int tok,
                        break;
                }
                if (!quote) {
-                       if (isspace(*p))
+                       if (isspace((int) *p))
                                break;
                        if (tok) {
                                for (t = tokenlist; t->str; t++)
@@ -156,7 +156,7 @@ static LRAD_TOKEN getthing(char **ptr, char *buf, int buflen, int tok,
        *s++ = 0;
 
        /* Skip whitespace again. */
-       while (*p && isspace(*p))
+       while (*p && isspace((int) *p))
                p++;
        *ptr = p;
 

diff --git a/src/lib/valuepair.c b/src/lib/valuepair.c
index ae7c2f2..3e8f5cc 100644 (file)
--- a/src/lib/valuepair.c
+++ b/src/lib/valuepair.c
@@ -458,7 +458,7 @@ static int gettime(const char *valstr, time_t *lvalue)
 
        strNcpy(buf, valstr, sizeof(buf));
        for (p = buf; *p; p++)
-               if (isupper(*p)) *p = tolower(*p);
+               if (isupper((int) *p)) *p = tolower((int) *p);
 
        p = buf;
        day = mystrtok(&p, " \t");
@@ -631,7 +631,7 @@ VALUE_PAIR *pairmake(const char *attribute, const char *value, int operator)
                         *
                         *      Note that ALL integers are unsigned!
                         */
-                       if (isdigit(*value)) {
+                       if (isdigit((int) *value)) {
                                vp->lvalue = atoi(value);
                                vp->length = 4;
                        }

diff --git a/src/main/auth.c b/src/main/auth.c
index 4465576..18c93f2 100644 (file)
--- a/src/main/auth.c
+++ b/src/main/auth.c
@@ -620,7 +620,7 @@ autz_redo:
 
                        p = auth_item->strvalue;
                        while (*p != '\0') {
-                               if (!isprint(*p)) {
+                               if (!isprint((int) *p)) {
                                        log_debug("  WARNING: Unprintable characters in the password.\n\t  Double-check the shared secret on the server and the NAS!");
                                        break;
                                }

diff --git a/src/main/exec.c b/src/main/exec.c
index b052a3a..b918f36 100644 (file)
--- a/src/main/exec.c
+++ b/src/main/exec.c
@@ -212,7 +212,7 @@ int radius_exec_program(const char *cmd, REQUEST *request,
                        for (p = buffer; *p != '='; p++) {
                                if (*p == '-') {
                                        *p = '_';
-                               } else if (isalpha(*p)) {
+                               } else if (isalpha((int) *p)) {
                                        *p = toupper(*p);
                                }
                        }

diff --git a/src/main/files.c b/src/main/files.c
index 035cfc4..f310a43 100644 (file)
--- a/src/main/files.c
+++ b/src/main/files.c
@@ -167,7 +167,7 @@ parse_again:
                        /*
                         *      Find the entry starting with the users name
                         */
-                       if (isspace(buffer[0]))  {
+                       if (isspace((int) buffer[0]))  {
                                if (parsecode != T_EOL) {
                                        radlog(L_ERR|L_CONS,
                                                        "%s[%d]: Unexpected trailing comma for entry %s",
@@ -186,10 +186,10 @@ parse_again:
                         *      $INCLUDE filename
                         */
                        if (strcasecmp(entry, "$include") == 0) {
-                               while(isspace(*ptr))
+                               while(isspace((int) *ptr))
                                        ptr++;
                                s = ptr;
-                               while (!isspace(*ptr))
+                               while (!isspace((int) *ptr))
                                        ptr++;
                                *ptr = 0;
 

diff --git a/src/main/radclient.c b/src/main/radclient.c
index 577b701..39719e4 100644 (file)
--- a/src/main/radclient.c
+++ b/src/main/radclient.c
@@ -213,7 +213,7 @@ int main(int argc, char **argv)
 
        while ((c = getopt(argc, argv, "c:d:f:hi:qst:r:S:xv")) != EOF) switch(c) {
                case 'c':
-                       if (!isdigit(*optarg)) 
+                       if (!isdigit((int) *optarg)) 
                                usage();
                        count = atoi(optarg);
                        break;
@@ -230,12 +230,12 @@ int main(int argc, char **argv)
                        librad_debug++;
                        break;
                case 'r':
-                       if (!isdigit(*optarg)) 
+                       if (!isdigit((int) *optarg)) 
                                usage();
                        retries = atoi(optarg);
                        break;
                case 'i':
-                       if (!isdigit(*optarg)) 
+                       if (!isdigit((int) *optarg)) 
                                usage();
                        id = atoi(optarg);
                        if ((id < 0) || (id > 255)) {
@@ -246,7 +246,7 @@ int main(int argc, char **argv)
                        do_summary = 1;
                        break;
                case 't':
-                       if (!isdigit(*optarg)) 
+                       if (!isdigit((int) *optarg)) 
                                usage();
                        timeout = atof(optarg);
                        break;
@@ -327,7 +327,7 @@ int main(int argc, char **argv)
                if (port == 0) port = PW_ACCT_UDP_PORT;
                req->code = PW_ACCOUNTING_REQUEST;
                do_summary = 0;
-       } else if (isdigit(argv[2][0])) {
+       } else if (isdigit((int) argv[2][0])) {
                if (port == 0) port = getport("radius");
                if (port == 0) port = PW_AUTH_UDP_PORT;
                req->code = atoi(argv[2]);

diff --git a/src/main/radwho.c b/src/main/radwho.c
index 0552acf..83f03d3 100644 (file)
--- a/src/main/radwho.c
+++ b/src/main/radwho.c
@@ -112,7 +112,7 @@ static FILE *safe_popen(const char *cmd, const char *mode)
        strncpy(buf, cmd, sizeof(buf));
        buf[sizeof(buf) - 1] = 0;
        for (p = buf; *p; p++) {
-               if (isalnum(*p))
+               if (isalnum((int) *p))
                        continue;
                if (strchr("@%-_ \t+:,./", *p) == NULL)
                        *p = ' ';

diff --git a/src/main/smux.c b/src/main/smux.c
index 6a150d5..abbd16f 100644 (file)
--- a/src/main/smux.c
+++ b/src/main/smux.c
@@ -1021,10 +1021,10 @@ smux_str2oid (char *str, oid *my_oid, size_t *oid_len)
                return 0;
 
        while (1) {
-               if (! isdigit (*str))
+               if (! isdigit ((int) *str))
                        return -1;
 
-               while (isdigit (*str)) {
+               while (isdigit ((int) *str)) {
                        val *= 10;
                        val += (*str - '0');
                        str++;

diff --git a/src/main/timestr.c b/src/main/timestr.c
index bb6bd00..ea79c15 100644 (file)
--- a/src/main/timestr.c
+++ b/src/main/timestr.c
@@ -89,7 +89,7 @@ static int hour_fill(char *bitmap, const char *tm)
        end = -1;
        if ((p = strchr(tm, '-')) != NULL) {
                p++;
-               if (p - tm != 5 || strlen(p) < 4 || !isdigit(*p))
+               if (p - tm != 5 || strlen(p) < 4 || !isdigit((int) *p))
                        return 0;
                end = 600 * val(p[0]) + 60 * val(p[1]) + atoi(p + 2);
        }
@@ -97,7 +97,7 @@ static int hour_fill(char *bitmap, const char *tm)
                start = 0;
                end = DAYMIN - 1;
        } else {
-               if (strlen(tm) < 4 || !isdigit(*tm))
+               if (strlen(tm) < 4 || !isdigit((int) *tm))
                        return 0;
                start = 600 * val(tm[0]) + 60 * val(tm[1]) + atoi(tm + 2);
                if (end < 0) end = start;
@@ -136,7 +136,7 @@ static int day_fill(char *bitmap, const char *tm)
        int start, end;
 
        for (hr = tm; *hr; hr++)
-               if (isdigit(*hr))
+               if (isdigit((int) *hr))
                        break;
        if (hr == tm) 
                tm = "Al";

diff --git a/src/modules/rlm_counter/rlm_counter.c b/src/modules/rlm_counter/rlm_counter.c
index 49e114c..77b38b2 100644 (file)
--- a/src/modules/rlm_counter/rlm_counter.c
+++ b/src/modules/rlm_counter/rlm_counter.c
@@ -154,14 +154,14 @@ static int find_next_reset(rlm_counter_t *data, time_t timeval)
 
        if (data->reset == NULL)
                return -1;
-       if (isdigit(data->reset[0])){
+       if (isdigit((int) data->reset[0])){
                unsigned int len=0;
 
                len = strlen(data->reset);
                if (len == 0)
                        return -1;
                last = data->reset[len - 1];
-               if (!isalpha(last))
+               if (!isalpha((int) last))
                        last = 'd';
                num = atoi(data->reset);
                DEBUG("rlm_counter: num=%d, last=%c",num,last);

diff --git a/src/modules/rlm_dbm/rlm_dbm_cat.c b/src/modules/rlm_dbm/rlm_dbm_cat.c
index 98e4e73..b006dd2 100644 (file)
--- a/src/modules/rlm_dbm/rlm_dbm_cat.c
+++ b/src/modules/rlm_dbm/rlm_dbm_cat.c
@@ -84,10 +84,10 @@ int main(int n, char **argv) {
        
        while ((ch = getopt(n, argv, "i:l:wf:v")) != -1)
                switch (ch) {
-                       case 'i':       if (!isdigit(*optarg)) usage();
+                       case 'i':       if (!isdigit((int) *optarg)) usage();
                                        lotstup = atoi(optarg);
                                        break;
-                       case 'l':       if (!isdigit(*optarg)) usage();
+                       case 'l':       if (!isdigit((int) *optarg)) usage();
                                        wraplen = atoi(optarg);
                                        break;
                        case 'w':       needwrap = 1; 

diff --git a/src/modules/rlm_dbm/rlm_dbm_parser.c b/src/modules/rlm_dbm/rlm_dbm_parser.c
index 072d08c..a74364a 100644 (file)
--- a/src/modules/rlm_dbm/rlm_dbm_parser.c
+++ b/src/modules/rlm_dbm/rlm_dbm_parser.c
@@ -207,7 +207,7 @@ static int storecontent (const char * username) {
 static int getuname(char **p,char *u,int n) {
        int     i; 
        
-       for(i=0 ; ( i < n-1 ) && ( **p ) && (! isspace(**p) ) ; (*p)++ ) 
+       for(i=0 ; ( i < n-1 ) && ( **p ) && (! isspace((int) **p) ) ; (*p)++ ) 
            u[i++] = **p;
        u[i] = '\0';
        return ( i == 0) ? 1:0;
@@ -235,7 +235,7 @@ static int sm_parse_file(FILE*fp,const char* fname) {
                }
        
                DOUT2("Parseline: %s",buff);
-               for ( p = buff; isspace(*p); p++);
+               for ( p = buff; isspace((int) *p); p++);
                 
                if ( *p == '#' || *p == 0 ) continue;
 
@@ -245,7 +245,7 @@ static int sm_parse_file(FILE*fp,const char* fname) {
 
                /* try to decide is this line new user or new pattern */
                if ( parse_state == SMP_PATTERN_OR_USER ) {
-                    if ( isspace(buff[0]) ) parse_state = SMP_PATTERN;
+                    if ( isspace((int) buff[0]) ) parse_state = SMP_PATTERN;
                        else {
                                parse_state = SMP_USER;
                                storecontent(username);
@@ -271,7 +271,7 @@ static int sm_parse_file(FILE*fp,const char* fname) {
                if ( parse_state == SMP_PATTERN || parse_state == SMP_ACTION ) {
 
                    /* check for empty line */
-                   while( *p && isspace(*p) ) p++;
+                   while( *p && isspace((int) *p) ) p++;
 
                    if ( *p && ( *p != ';' ) ) tok = userparse(p,&vp);
                    else tok = T_EOL;  /* ';' - signs empty line */

diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index e1447eb..63bd7a1 100644 (file)
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -188,7 +188,7 @@ static void lmpwdhash (char *szHash, const char *szPassword)
 
        memset(szOEMPass, 0, 14);
        for (i = 0; i < 14 && szPassword[i]; i++)
-               szOEMPass[i] = toupper(szPassword[i]);
+               szOEMPass[i] = toupper((int) szPassword[i]);
 
        /* Obtain DES hash of OEM password */
        des_encrypt(stdText, szOEMPass, szHash); 

diff --git a/src/modules/rlm_mschap/smbpass.c b/src/modules/rlm_mschap/smbpass.c
index 0e2d700..e2232f2 100644 (file)
--- a/src/modules/rlm_mschap/smbpass.c
+++ b/src/modules/rlm_mschap/smbpass.c
@@ -104,8 +104,8 @@ int hex2bin (const char *szHex, unsigned char* szBin, int len)
        int i;
    
        for (i = 0; i < len; i++) {
-               if( !(c1 = memchr(letters, toupper(szHex[i << 1]), 16)) ||
-                   !(c2 = memchr(letters, toupper(szHex[(i << 1) + 1]), 16)))
+               if( !(c1 = memchr(letters, toupper((int) szHex[i << 1]), 16)) ||
+                   !(c2 = memchr(letters, toupper((int) szHex[(i << 1) + 1]), 16)))
                     break;
                  szBin[i] = ((c1-letters)<<4) + (c2-letters);
         }
@@ -213,13 +213,13 @@ struct smb_passwd *getsmbfilepwent(struct smb_passwd *pw_buf, FILE *fp)
                  continue;
                }
 
-               if (!isdigit(*p)) {
+               if (!isdigit((int) *p)) {
                  continue;
                }
 
                uidval = atoi(p);
 
-               while (*p && isdigit(*p))
+               while (*p && isdigit((int) *p))
                  p++;
 
                if (*p != ':') {
@@ -298,7 +298,7 @@ struct smb_passwd *getsmbfilepwent(struct smb_passwd *pw_buf, FILE *fp)
                      int i;
                      p += 4;
                      for(i = 0; i < 8; i++) {
-                       if(p[i] == '\0' || !isxdigit(p[i]))
+                       if(p[i] == '\0' || !isxdigit((int) p[i]))
                          break;
                      }
                      if(i == 8) {

diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
index b5fe2c5..3f195d0 100644 (file)
--- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
+++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
@@ -95,14 +95,14 @@ static int find_next_reset(rlm_sqlcounter_t *data, time_t timeval)
 
        if (data->reset == NULL)
                return -1;
-       if (isdigit(data->reset[0])){
+       if (isdigit((int) data->reset[0])){
                unsigned int len=0;
 
                len = strlen(data->reset);
                if (len == 0)
                        return -1;
                last = data->reset[len - 1];
-               if (!isalpha(last))
+               if (!isalpha((int) last))
                        last = 'd';
                num = atoi(data->reset);
                DEBUG("rlm_sqlcounter: num=%d, last=%c",num,last);
@@ -162,14 +162,14 @@ static int find_prev_reset(rlm_sqlcounter_t *data, time_t timeval)
 
        if (data->reset == NULL)
                return -1;
-       if (isdigit(data->reset[0])){
+       if (isdigit((int) data->reset[0])){
                unsigned int len=0;
 
                len = strlen(data->reset);
                if (len == 0)
                        return -1;
                last = data->reset[len - 1];
-               if (!isalpha(last))
+               if (!isalpha((int) last))
                        last = 'd';
                num = atoi(data->reset);
                DEBUG("rlm_sqlcounter: num=%d, last=%c",num,last);

diff --git a/src/modules/rlm_x99_token/crcalc.c b/src/modules/rlm_x99_token/crcalc.c
index 7f2e77f..6693038 100644 (file)
--- a/src/modules/rlm_x99_token/crcalc.c
+++ b/src/modules/rlm_x99_token/crcalc.c
@@ -127,7 +127,7 @@ main(int argc, char *argv[])
            fprintf(stderr, "key too long\n");
            exit(1);
        }
-       ascii_key[i++] = tolower(*p++);
+       ascii_key[i++] = tolower((int) *p++);
     }
     if (strlen(ascii_key) < 16) {
        fprintf(stderr, "key too short\n");