X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstring%2Fstrchr.c;h=d3563f18c932d139b7b78f5e37a473518671a5a0;hb=aaa9eb5101e3a748218fb9373dd9655b50582da2;hp=e606f4fee48f3155c22e426f69d9495b60979dd9;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/string/strchr.c b/src/string/strchr.c
index e606f4fe..d3563f18 100644
--- a/src/string/strchr.c
+++ b/src/string/strchr.c
@@ -10,14 +10,17 @@
 
 char *strchr(const char *s, int c)
 {
-	c = (char)c;
+	size_t *w, k;
+
+	c = (unsigned char)c;
 	if (!c) return (char *)s + strlen(s);
-	for (; ((uintptr_t)s & ALIGN) && *s && *s != c; s++);
-	if (*s && *s != c) {
-		const size_t *w;
-		size_t k = ONES * c;
-		for (w = (const void *)s; !HASZERO(*w) && !HASZERO(*w^k); w++);
-		for (s = (const void *)w; *s && *s != c; s++);
-	}
-	return *s ? (char *)s : 0;
+
+	for (; ((uintptr_t)s & ALIGN); s++)
+		if (*(unsigned char *)s == c) return (char *)s;
+		else if (!*s) return 0;
+	k = ONES * c;
+	for (w = (void *)s; !HASZERO(*w) && !HASZERO(*w^k); w++);
+	for (s = (void *)w; *s; s++)
+		if (*(unsigned char *)s == c) return (char *)s;
+	return 0;
 }