Evolinx/libandroid-support
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Remove clang warnings

Browse Source
This commit is contained in:
Fredrik Fornwall 2017-07-15 03:52:47 +02:00
parent 051586e493
commit a8c669c7ec
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/musl-ctype/towctrans.c
View File

@ -235,11 +235,17 @@ static wchar_t __towcase(wchar_t wc, int lower)
return wc;
/* special case because the diff between upper/lower is too big */
if (lower && (unsigned)wc - 0x10a0 < 0x2e)
if (wc>0x10c5 && wc != 0x10c7 && wc != 0x10cd) return wc;
else return wc + 0x2d00 - 0x10a0;
if (wc>0x10c5 && wc != 0x10c7 && wc != 0x10cd) {
return wc;
} else {
return wc + 0x2d00 - 0x10a0;
}
if (!lower && (unsigned)wc - 0x2d00 < 0x26)
if (wc>0x2d25 && wc != 0x2d27 && wc != 0x2d2d) return wc;
else return wc + 0x10a0 - 0x2d00;
if (wc>0x2d25 && wc != 0x2d27 && wc != 0x2d2d) {
return wc;
} else {
return wc + 0x10a0 - 0x2d00;
}
for (i=0; casemaps[i].len; i++) {
int base = casemaps[i].upper + (lmask & casemaps[i].lower);
if ((unsigned)wc-base < casemaps[i].len) {

10
src/musl-locale/iconv.c
View File

@ -139,7 +139,7 @@ static void put_16(unsigned char *s, unsigned c, int e)
static unsigned get_32(const unsigned char *s, int e)
{
e &= 3;
return s[e]+0U<<24 | s[e^1]<<16 | s[e^2]<<8 | s[e^3];
return (s[e]+0U)<<24 | s[e^1]<<16 | s[e^2]<<8 | s[e^3];
}
static void put_32(unsigned char *s, unsigned c, int e)
@ -321,7 +321,7 @@ size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restr
"\303\212\314\214"
"\303\252\314\204"
"\303\252\314\214"
+c%256}, &(size_t){4},
[c%256]}, &(size_t){4},
out, outb);
continue;
}
@ -341,7 +341,7 @@ size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restr
if (c >= 93 || d >= 94) {
c += (0xa1-0x81);
d += 0xa1;
if (c >= 93 || c>=0xc6-0x81 && d>0x52)
if (c >= 93 || (c>=0xc6-0x81 && d>0x52))
goto ilseq;
if (d-'A'<26) d = d-'A';
else if (d-'a'<26) d = d-'a'+26;
@ -369,7 +369,7 @@ size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restr
if (c < 128+type) break;
c -= 128+type;
c = legacy_chars[ map[c*5/4]>>2*c%8 |
map[c*5/4+1]<<8-2*c%8 & 1023 ];
(map[c*5/4+1]<<(8-2*c%8) & 1023) ];
if (!c) c = *(unsigned char *)*in;
if (c==1) goto ilseq;
}
@ -404,7 +404,7 @@ size_t iconv(iconv_t cd0, char **restrict in, size_t *restrict inb, char **restr
d = c;
for (c=0; c<128-totype; c++) {
if (d == legacy_chars[ tomap[c*5/4]>>2*c%8 |
tomap[c*5/4+1]<<8-2*c%8 & 1023 ]) {
(tomap[c*5/4+1]<<(8-2*c%8) & 1023) ]) {
c += 128;
goto revout;
}