use a more-correct integer type, and silence 64-bit warnings as a bonus

This commit is contained in:
Rich Felker 2011-02-13 23:38:21 -05:00
parent 05ea04558f
commit 7fe308eb9f

View File

@ -292,7 +292,7 @@ static int fuzzycmp(const char *a, const char *b)
return *a != *b; return *a != *b;
} }
static int find_charmap(const char *name) static size_t find_charmap(const char *name)
{ {
const unsigned char *s; const unsigned char *s;
for (s=charmaps; *s; ) { for (s=charmaps; *s; ) {
@ -308,7 +308,7 @@ static int find_charmap(const char *name)
iconv_t iconv_open(const char *to, const char *from) iconv_t iconv_open(const char *to, const char *from)
{ {
int f, t; size_t f, t;
if ((t = find_charmap(to)) < 0 || (f = find_charmap(from)) < 0) { if ((t = find_charmap(to)) < 0 || (f = find_charmap(from)) < 0) {
errno = EINVAL; errno = EINVAL;