X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmultibyte%2Fmbsrtowcs.c;h=8313d37bfb761b2efbee574a43439f881f7e8a73;hb=be48e22b424b6f858da0151a0b3b68bdb96b41ca;hp=e2b434807d930160053f72b53107e445de3f9eea;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/multibyte/mbsrtowcs.c b/src/multibyte/mbsrtowcs.c
index e2b43480..8313d37b 100644
--- a/src/multibyte/mbsrtowcs.c
+++ b/src/multibyte/mbsrtowcs.c
@@ -11,10 +11,10 @@
 
 #include "internal.h"
 
-size_t mbsrtowcs(wchar_t *ws, const char **src, size_t wn, mbstate_t *st)
+size_t mbsrtowcs(wchar_t *restrict ws, const char **restrict src, size_t wn, mbstate_t *restrict st)
 {
 	unsigned c;
-	const unsigned char *s = *src;
+	const unsigned char *s = (const void *)*src;
 	const wchar_t *wsorig = ws;
 
 	if (!st) st = (void *)&c, c = 0;
@@ -30,35 +30,29 @@ size_t mbsrtowcs(wchar_t *ws, const char **src, size_t wn, mbstate_t *st)
 	}
 
 	if (!ws) for (wn=0;;) {
-		if ((unsigned)*s-SA >= SB-SA) {
-			while (((unsigned)s&3) && (unsigned)*s-1<0x7f) s++, wn++;
+		if (*s-SA >= SB-SA) {
+			while (((uintptr_t)s&3) && *s-1u<0x7f) s++, wn++;
 			while (!(( *(uint32_t*)s | *(uint32_t*)s-0x01010101) & 0x80808080)) s+=4, wn+=4;
-			while ((unsigned)*s-1<0x7f) s++, wn++;
+			while (*s-1u<0x7f) s++, wn++;
 			if (!*s) return wn;
-			if ((unsigned)*s-SA >= SB-SA) goto ilseq2;
+			if (*s-SA >= SB-SA) goto ilseq2;
 		}
 		c = bittab[*s++-SA];
 		do {
 resume0:
 			if (OOB(c,*s)) goto ilseq2; s++;
 			c <<= 6; if (!(c&(1U<<31))) break;
-#ifdef I_FAILED_TO_RTFM_RFC3629
-			if ((unsigned)*s++-0x80 >= 0x40) goto ilseq2;
+			if (*s++-0x80u >= 0x40) goto ilseq2;
 			c <<= 6; if (!(c&(1U<<31))) break;
-			if ((unsigned)*s++-0x80 >= 0x40) goto ilseq2;
-			c <<= 6; if (!(c&(1U<<31))) break;
-#endif
-			if ((unsigned)*s++-0x80 >= 0x40) goto ilseq2;
-			c <<= 6; if (!(c&(1U<<31))) break;
-			if ((unsigned)*s++-0x80 >= 0x40) goto ilseq2;
+			if (*s++-0x80u >= 0x40) goto ilseq2;
 		} while (0);
 		wn++; c = 0;
 	}
 
 	while (wn) {
-		if ((unsigned)*s-SA >= SB-SA) {
+		if (*s-SA >= SB-SA) {
 			if (wn >= 7) {
-				while (((unsigned)s&3) && (unsigned)*s-1<0x7f) {
+				while (((uintptr_t)s&3) && *s-1u<0x7f) {
 					*ws++ = *s++;
 					wn--;
 				}
@@ -70,7 +64,7 @@ resume0:
 					wn -= 4;
 				}
 			}
-			while (wn && (unsigned)*s-1<0x7f) {
+			while (wn && *s-1u<0x7f) {
 				*ws++ = *s++;
 				wn--;
 			}
@@ -80,7 +74,7 @@ resume0:
 				*src = 0;
 				return ws-wsorig;
 			}
-			if ((unsigned)*s-SA >= SB-SA) goto ilseq;
+			if (*s-SA >= SB-SA) goto ilseq;
 		}
 		c = bittab[*s++-SA];
 		do {
@@ -89,30 +83,20 @@ resume:
 			c = (c<<6) | *s++-0x80;
 			if (!(c&(1U<<31))) break;
 
-#ifdef I_FAILED_TO_RTFM_RFC3629
-			if ((unsigned)*s-0x80 >= 0x40) goto ilseq;
-			c = (c<<6) | *s++-0x80;
-			if (!(c&(1U<<31))) break;
-
-			if ((unsigned)*s-0x80 >= 0x40) goto ilseq;
-			c = (c<<6) | *s++-0x80;
-			if (!(c&(1U<<31))) break;
-#endif
-
-			if ((unsigned)*s-0x80 >= 0x40) goto ilseq;
+			if (*s-0x80u >= 0x40) goto ilseq;
 			c = (c<<6) | *s++-0x80;
 			if (!(c&(1U<<31))) break;
 
-			if ((unsigned)*s-0x80 >= 0x40) goto ilseq;
+			if (*s-0x80u >= 0x40) goto ilseq;
 			c = (c<<6) | *s++-0x80;
 		} while (0);
 
 		*ws++ = c; wn--; c = 0;
 	}
-	*src = s;
+	*src = (const void *)s;
 	return ws-wsorig;
 ilseq:
-	*src = s;
+	*src = (const void *)s;
 ilseq2:
 	/* enter permanently failing state */
 	*(unsigned *)st = FAILSTATE;