X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstring%2Fstrspn.c;h=9543dad09a3aba8bf2c616fb00d492f0e9fb94cd;hb=d62f4e98881702f07501b965e5beebd7516deca2;hp=59b063e5bebabfcd1b7a492fe4f57f44df677c29;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/string/strspn.c b/src/string/strspn.c
index 59b063e5..9543dad0 100644
--- a/src/string/strspn.c
+++ b/src/string/strspn.c
@@ -3,11 +3,9 @@
 #define BITOP(a,b,op) \
  ((a)[(size_t)(b)/(8*sizeof *(a))] op (size_t)1<<((size_t)(b)%(8*sizeof *(a))))
 
-size_t strspn(const char *_s, const char *_c)
+size_t strspn(const char *s, const char *c)
 {
-	const unsigned char *s = _s;
-	const unsigned char *c = _c;
-	const unsigned char *a = s;
+	const char *a = s;
 	size_t byteset[32/sizeof(size_t)] = { 0 };
 
 	if (!c[0]) return 0;
@@ -16,7 +14,7 @@ size_t strspn(const char *_s, const char *_c)
 		return s-a;
 	}
 
-	for (; *c && BITOP(byteset, *c, |=); c++);
-	for (; *s && BITOP(byteset, *s, &); s++);
+	for (; *c && BITOP(byteset, *(unsigned char *)c, |=); c++);
+	for (; *s && BITOP(byteset, *(unsigned char *)s, &); s++);
 	return s-a;
 }