projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix trailing whitespace issues that crept in here and there
[musl]
/
src
/
multibyte
/
mbsrtowcs.c
diff --git
a/src/multibyte/mbsrtowcs.c
b/src/multibyte/mbsrtowcs.c
index
64399cf
..
8313d37
100644
(file)
--- a/
src/multibyte/mbsrtowcs.c
+++ b/
src/multibyte/mbsrtowcs.c
@@
-11,7
+11,7
@@
#include "internal.h"
#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 = (const void *)*src;
{
unsigned c;
const unsigned char *s = (const void *)*src;
@@
-42,12
+42,6
@@
size_t mbsrtowcs(wchar_t *ws, const char **src, size_t wn, mbstate_t *st)
resume0:
if (OOB(c,*s)) goto ilseq2; s++;
c <<= 6; if (!(c&(1U<<31))) break;
resume0:
if (OOB(c,*s)) goto ilseq2; s++;
c <<= 6; if (!(c&(1U<<31))) break;
-#ifdef I_FAILED_TO_RTFM_RFC3629
- if (*s++-0x80u >= 0x40) goto ilseq2;
- c <<= 6; if (!(c&(1U<<31))) break;
- if (*s++-0x80u >= 0x40) goto ilseq2;
- c <<= 6; if (!(c&(1U<<31))) break;
-#endif
if (*s++-0x80u >= 0x40) goto ilseq2;
c <<= 6; if (!(c&(1U<<31))) break;
if (*s++-0x80u >= 0x40) goto ilseq2;
if (*s++-0x80u >= 0x40) goto ilseq2;
c <<= 6; if (!(c&(1U<<31))) break;
if (*s++-0x80u >= 0x40) goto ilseq2;
@@
-89,16
+83,6
@@
resume:
c = (c<<6) | *s++-0x80;
if (!(c&(1U<<31))) break;
c = (c<<6) | *s++-0x80;
if (!(c&(1U<<31))) break;
-#ifdef I_FAILED_TO_RTFM_RFC3629
- if (*s-0x80u >= 0x40) goto ilseq;
- c = (c<<6) | *s++-0x80;
- if (!(c&(1U<<31))) break;
-
- if (*s-0x80u >= 0x40) goto ilseq;
- c = (c<<6) | *s++-0x80;
- if (!(c&(1U<<31))) break;
-#endif
-
if (*s-0x80u >= 0x40) goto ilseq;
c = (c<<6) | *s++-0x80;
if (!(c&(1U<<31))) break;
if (*s-0x80u >= 0x40) goto ilseq;
c = (c<<6) | *s++-0x80;
if (!(c&(1U<<31))) break;