on x86_64 use long instead of long long for 64bit posix types

[musl] / src / multibyte / mbrtowc.c

diff --git a/src/multibyte/mbrtowc.c b/src/multibyte/mbrtowc.c
index 09badeb..db80366 100644 (file)
--- a/src/multibyte/mbrtowc.c
+++ b/src/multibyte/mbrtowc.c
@@ -11,26 +11,25 @@
 
 #include "internal.h"
 
-size_t mbrtowc(wchar_t *wc, const char *src, size_t n, mbstate_t *st)
+size_t mbrtowc(wchar_t *restrict wc, const char *restrict src, size_t n, mbstate_t *restrict st)
 {
        static unsigned internal_state;
        unsigned c;
-       const unsigned char *s = src;
+       const unsigned char *s = (const void *)src;
        const unsigned N = n;
 
        if (!st) st = (void *)&internal_state;
        c = *(unsigned *)st;
        
        if (!s) {
-               s = "";
-               wc = (void *)&wc;
-               n = 1;
+               if (c) goto ilseq;
+               return 0;
        } else if (!wc) wc = (void *)&wc;
 
        if (!n) return -2;
        if (!c) {
-               if ((unsigned)*s < 0x80) return !!(*wc = *s);
-               if ((unsigned)*s-SA > SB-SA) goto ilseq;
+               if (*s < 0x80) return !!(*wc = *s);
+               if (*s-SA > SB-SA) goto ilseq;
                c = bittab[*s++-SA]; n--;
        }
 
@@ -44,7 +43,7 @@ loop:
                        return N-n;
                }
                if (n) {
-                       if ((unsigned)*s-0x80 >= 0x40) goto ilseq;
+                       if (*s-0x80u >= 0x40) goto ilseq;
                        goto loop;
                }
        }
@@ -52,7 +51,7 @@ loop:
        *(unsigned *)st = c;
        return -2;
 ilseq:
-       *(unsigned *)st = FAILSTATE;
+       *(unsigned *)st = 0;
        errno = EILSEQ;
        return -1;
 }