Fix compiler warning: array subscript has type 'char'

pull/1/head
Yang Tse 15 years ago
parent 494274e653
commit dac69d52c2
  1. 12
      acountry.c
  2. 4
      ares_getnameinfo.c
  3. 2
      setup_once.h

@ -558,8 +558,8 @@ static void find_country_from_cname(const char *cname, struct in_addr addr)
unsigned long ip; unsigned long ip;
ip = ntohl(addr.s_addr); ip = ntohl(addr.s_addr);
z0 = tolower(cname[0]); z0 = TOLOWER(cname[0]);
z1 = tolower(cname[1]); z1 = TOLOWER(cname[1]);
ccopy = strdup(cname); ccopy = strdup(cname);
dot_4 = NULL; dot_4 = NULL;
@ -577,8 +577,8 @@ static void find_country_from_cname(const char *cname, struct in_addr addr)
} }
else if (ver_2) else if (ver_2)
{ {
z0 = tolower(dot_4[1]); z0 = TOLOWER(dot_4[1]);
z1 = tolower(dot_4[2]); z1 = TOLOWER(dot_4[2]);
if (z0 != 'z' && z1 != 'z') if (z0 != 'z' && z1 != 'z')
{ {
printf("Unexpected CNAME %s (ver_2)\n", cname); printf("Unexpected CNAME %s (ver_2)\n", cname);
@ -593,8 +593,8 @@ static void find_country_from_cname(const char *cname, struct in_addr addr)
if (ver_1) if (ver_1)
{ {
ccode_A2[0] = (char)tolower(cname[2]); ccode_A2[0] = (char)TOLOWER(cname[2]);
ccode_A2[1] = (char)tolower(cname[3]); ccode_A2[1] = (char)TOLOWER(cname[3]);
ccode_A2[2] = '\0'; ccode_A2[2] = '\0';
} }
else else

@ -408,8 +408,8 @@ static char *ares_striendstr(const char *s1, const char *s2)
c2 = s2; c2 = s2;
while (c2 < s2+s2_len) while (c2 < s2+s2_len)
{ {
lo1 = tolower(*c1); lo1 = TOLOWER(*c1);
lo2 = tolower(*c2); lo2 = TOLOWER(*c2);
if (lo1 != lo2) if (lo1 != lo2)
return NULL; return NULL;
else else

@ -252,6 +252,8 @@ struct timeval {
#define ISBLANK(x) (int)((((unsigned char)x) == ' ') || \ #define ISBLANK(x) (int)((((unsigned char)x) == ' ') || \
(((unsigned char)x) == '\t')) (((unsigned char)x) == '\t'))
#define TOLOWER(x) (tolower((int) ((unsigned char)x)))
/* /*
* 'bool' exists on platforms with <stdbool.h>, i.e. C99 platforms. * 'bool' exists on platforms with <stdbool.h>, i.e. C99 platforms.

Loading…
Cancel
Save