X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Flocale%2Ficonv.c;h=a2332ce007a45a7f70b971f8a81c4bff0c95180c;hb=b6218764ebca59ff5dae0e87b696188c8de0119e;hp=508d322e5e38927da68e31e0ab137f2299415086;hpb=26710be7148d51a954c4fe4acedab90d161e609a;p=musl diff --git a/src/locale/iconv.c b/src/locale/iconv.c index 508d322e..a2332ce0 100644 --- a/src/locale/iconv.c +++ b/src/locale/iconv.c @@ -139,7 +139,7 @@ static void put_32(unsigned char *s, unsigned c, int e) #define mbrtowc_utf8 mbrtowc #define wctomb_utf8 wctomb -size_t iconv(iconv_t cd0, char **in, size_t *inb, char **out, size_t *outb) +size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restrict out, size_t *restrict outb) { size_t x=0; unsigned long cd = (unsigned long)cd0; @@ -316,8 +316,8 @@ size_t iconv(iconv_t cd0, char **in, size_t *inb, char **out, size_t *outb) } d = c; for (c=0; c<128-totype; c++) { - if (d == legacy_chars[ map[c*5/4]>>2*c%8 | - map[c*5/4+1]<<8-2*c%8 & 1023 ]) { + if (d == legacy_chars[ tomap[c*5/4]>>2*c%8 | + tomap[c*5/4+1]<<8-2*c%8 & 1023 ]) { c += 128; goto revout; }