simplify/optimize iconv utf-8 case

[oweals/musl.git] / src / locale / iconv.c

diff --git a/src/locale/iconv.c b/src/locale/iconv.c
index 5f1b0a3e8d4681c7fba895080431d14441260d1b..fd51b73e86da1adbd5789d9bbbeb0008b5a80051 100644 (file)
--- a/src/locale/iconv.c
+++ b/src/locale/iconv.c
@@ -129,11 +129,6 @@ iconv_t iconv_open(const char *to, const char *from)
        return combine_to_from(t, f);
 }
 
-int iconv_close(iconv_t cd)
-{
-       return 0;
-}
-
 static unsigned get_16(const unsigned char *s, int e)
 {
        e &= 1;
@@ -198,16 +193,17 @@ size_t iconv(iconv_t cd, char **restrict in, size_t *restrict inb, char **restri
                c = *(unsigned char *)*in;
                l = 1;
 
-               if (c >= 128 || type-UTF_32BE < 7U) switch (type) {
+               switch (type) {
                case UTF_8:
+                       if (c < 128) break;
                        l = mbrtowc_utf8(&wc, *in, *inb, &st);
-                       if (!l) l++;
-                       else if (l == (size_t)-1) goto ilseq;
-                       else if (l == (size_t)-2) goto starved;
+                       if (l == (size_t)-1) goto ilseq;
+                       if (l == (size_t)-2) goto starved;
                        c = wc;
                        break;
                case US_ASCII:
-                       goto ilseq;
+                       if (c >= 128) goto ilseq;
+                       break;
                case WCHAR_T:
                        l = sizeof(wchar_t);
                        if (*inb < l) goto starved;
@@ -239,6 +235,7 @@ size_t iconv(iconv_t cd, char **restrict in, size_t *restrict inb, char **restri
                        }
                        break;
                case SHIFT_JIS:
+                       if (c < 128) break;
                        if (c-0xa1 <= 0xdf-0xa1) {
                                c += 0xff61-0xa1;
                                break;
@@ -262,6 +259,7 @@ size_t iconv(iconv_t cd, char **restrict in, size_t *restrict inb, char **restri
                        if (!c) goto ilseq;
                        break;
                case EUC_JP:
+                       if (c < 128) break;
                        l = 2;
                        if (*inb < 2) goto starved;
                        d = *((unsigned char *)*in + 1);
@@ -278,9 +276,11 @@ size_t iconv(iconv_t cd, char **restrict in, size_t *restrict inb, char **restri
                        if (!c) goto ilseq;
                        break;
                case GB2312:
+                       if (c < 128) break;
                        if (c < 0xa1) goto ilseq;
                case GBK:
                case GB18030:
+                       if (c < 128) break;
                        c -= 0x81;
                        if (c >= 126) goto ilseq;
                        l = 2;
@@ -316,6 +316,7 @@ size_t iconv(iconv_t cd, char **restrict in, size_t *restrict inb, char **restri
                        c = gb18030[c][d];
                        break;
                case BIG5:
+                       if (c < 128) break;
                        l = 2;
                        if (*inb < 2) goto starved;
                        d = *((unsigned char *)*in + 1);
@@ -353,6 +354,7 @@ size_t iconv(iconv_t cd, char **restrict in, size_t *restrict inb, char **restri
                        if (!c) goto ilseq;
                        break;
                case EUC_KR:
+                       if (c < 128) break;
                        l = 2;
                        if (*inb < 2) goto starved;
                        d = *((unsigned char *)*in + 1);