From a8c669c7eca15c5f598273a3831e927be6c3c96b Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 15 Jul 2017 03:52:47 +0200
Subject: [PATCH] Remove clang warnings

---
 src/musl-ctype/towctrans.c | 14 ++++++++++----
 src/musl-locale/iconv.c    | 10 +++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/musl-ctype/towctrans.c b/src/musl-ctype/towctrans.c
index 2842d69..a5a50d0 100644
--- a/src/musl-ctype/towctrans.c
+++ b/src/musl-ctype/towctrans.c
@@ -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) {
diff --git a/src/musl-locale/iconv.c b/src/musl-locale/iconv.c
index 0dc54a4..f3e1c71 100644
--- a/src/musl-locale/iconv.c
+++ b/src/musl-locale/iconv.c
@@ -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;
 				}