aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-02-13 23:38:21 -0500
committerRich Felker <dalias@aerifal.cx>2011-02-13 23:38:21 -0500
commit7fe308eb9fbebdd39a2e17352b172aa00b381dba (patch)
tree85cb3e7235d20f8084bf3859f58d6a857ca004cf
parent05ea04558f4e20056ab4f198dc483a5700432dee (diff)
downloadmusl-7fe308eb9fbebdd39a2e17352b172aa00b381dba.zip
musl-7fe308eb9fbebdd39a2e17352b172aa00b381dba.tar.gz
musl-7fe308eb9fbebdd39a2e17352b172aa00b381dba.tar.bz2
use a more-correct integer type, and silence 64-bit warnings as a bonus
-rw-r--r--src/locale/iconv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/locale/iconv.c b/src/locale/iconv.c
index 4e46c7e..ce2c364 100644
--- a/src/locale/iconv.c
+++ b/src/locale/iconv.c
@@ -292,7 +292,7 @@ static int fuzzycmp(const char *a, const char *b)
return *a != *b;
}
-static int find_charmap(const char *name)
+static size_t find_charmap(const char *name)
{
const unsigned char *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)
{
- int f, t;
+ size_t f, t;
if ((t = find_charmap(to)) < 0 || (f = find_charmap(from)) < 0) {
errno = EINVAL;