rework langinfo code for ABI compat and for use by time code

[musl] / src / locale / iconv.c

diff --git a/src/locale/iconv.c b/src/locale/iconv.c
index 508d322..a2332ce 100644 (file)
--- 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;
                                }