X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmultibyte%2Fmbrtowc.c;h=db803661411519744cb195a802ef52093d0ce4a9;hb=ae0c1de530bc3b27069008b8b247171d08dbe80b;hp=291537f800f3705cffd50a570e9186a328c674a1;hpb=9ae8d5fc71a4b61ec826d58f03f7b543755fb1d4;p=musl diff --git a/src/multibyte/mbrtowc.c b/src/multibyte/mbrtowc.c index 291537f8..db803661 100644 --- a/src/multibyte/mbrtowc.c +++ b/src/multibyte/mbrtowc.c @@ -11,7 +11,7 @@ #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; @@ -22,9 +22,8 @@ size_t mbrtowc(wchar_t *wc, const char *src, size_t n, mbstate_t *st) c = *(unsigned *)st; if (!s) { - s = (void *)""; - wc = (void *)&wc; - n = 1; + if (c) goto ilseq; + return 0; } else if (!wc) wc = (void *)&wc; if (!n) return -2; @@ -52,7 +51,7 @@ loop: *(unsigned *)st = c; return -2; ilseq: - *(unsigned *)st = FAILSTATE; + *(unsigned *)st = 0; errno = EILSEQ; return -1; }