projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup multibyte stuff to remove ugly casts, sanitize the ptr align casts
[musl]
/
src
/
multibyte
/
mbsrtowcs.c
diff --git
a/src/multibyte/mbsrtowcs.c
b/src/multibyte/mbsrtowcs.c
index
e2b4348
..
64399cf
100644
(file)
--- a/
src/multibyte/mbsrtowcs.c
+++ b/
src/multibyte/mbsrtowcs.c
@@
-14,7
+14,7
@@
size_t mbsrtowcs(wchar_t *ws, const char **src, size_t wn, mbstate_t *st)
{
unsigned c;
size_t mbsrtowcs(wchar_t *ws, const char **src, size_t wn, mbstate_t *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;
const wchar_t *wsorig = ws;
if (!st) st = (void *)&c, c = 0;
@@
-30,12
+30,12
@@
size_t mbsrtowcs(wchar_t *ws, const char **src, size_t wn, mbstate_t *st)
}
if (!ws) for (wn=0;;) {
}
if (!ws) for (wn=0;;) {
- if (
(unsigned)
*s-SA >= SB-SA) {
- while (((u
nsigned)s&3) && (unsigned)*s-1
<0x7f) s++, wn++;
+ if (*s-SA >= SB-SA) {
+ while (((u
intptr_t)s&3) && *s-1u
<0x7f) s++, wn++;
while (!(( *(uint32_t*)s | *(uint32_t*)s-0x01010101) & 0x80808080)) s+=4, wn+=4;
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 (!*s) return wn;
- if (
(unsigned)
*s-SA >= SB-SA) goto ilseq2;
+ if (*s-SA >= SB-SA) goto ilseq2;
}
c = bittab[*s++-SA];
do {
}
c = bittab[*s++-SA];
do {
@@
-43,22
+43,22
@@
resume0:
if (OOB(c,*s)) goto ilseq2; s++;
c <<= 6; if (!(c&(1U<<31))) break;
#ifdef I_FAILED_TO_RTFM_RFC3629
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;
c <<= 6; if (!(c&(1U<<31))) break;
- if (
(unsigned)*s++-0x80
>= 0x40) goto ilseq2;
+ if (
*s++-0x80u
>= 0x40) goto ilseq2;
c <<= 6; if (!(c&(1U<<31))) break;
#endif
c <<= 6; if (!(c&(1U<<31))) break;
#endif
- if (
(unsigned)*s++-0x80
>= 0x40) goto ilseq2;
+ if (
*s++-0x80u
>= 0x40) goto ilseq2;
c <<= 6; if (!(c&(1U<<31))) break;
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) {
} while (0);
wn++; c = 0;
}
while (wn) {
- if (
(unsigned)
*s-SA >= SB-SA) {
+ if (*s-SA >= SB-SA) {
if (wn >= 7) {
if (wn >= 7) {
- while (((u
nsigned)s&3) && (unsigned)*s-1
<0x7f) {
+ while (((u
intptr_t)s&3) && *s-1u
<0x7f) {
*ws++ = *s++;
wn--;
}
*ws++ = *s++;
wn--;
}
@@
-70,7
+70,7
@@
resume0:
wn -= 4;
}
}
wn -= 4;
}
}
- while (wn &&
(unsigned)*s-1
<0x7f) {
+ while (wn &&
*s-1u
<0x7f) {
*ws++ = *s++;
wn--;
}
*ws++ = *s++;
wn--;
}
@@
-80,7
+80,7
@@
resume0:
*src = 0;
return ws-wsorig;
}
*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 {
}
c = bittab[*s++-SA];
do {
@@
-90,29
+90,29
@@
resume:
if (!(c&(1U<<31))) break;
#ifdef I_FAILED_TO_RTFM_RFC3629
if (!(c&(1U<<31))) break;
#ifdef I_FAILED_TO_RTFM_RFC3629
- if (
(unsigned)*s-0x80
>= 0x40) goto ilseq;
+ if (
*s-0x80u
>= 0x40) goto ilseq;
c = (c<<6) | *s++-0x80;
if (!(c&(1U<<31))) break;
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;
if (!(c&(1U<<31))) break;
#endif
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;
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;
}
c = (c<<6) | *s++-0x80;
} while (0);
*ws++ = c; wn--; c = 0;
}
- *src = s;
+ *src =
(const void *)
s;
return ws-wsorig;
ilseq:
return ws-wsorig;
ilseq:
- *src = s;
+ *src =
(const void *)
s;
ilseq2:
/* enter permanently failing state */
*(unsigned *)st = FAILSTATE;
ilseq2:
/* enter permanently failing state */
*(unsigned *)st = FAILSTATE;