fix wrong return value from wmemmove on forward copies

[musl] / src / string / strspn.c

diff --git a/src/string/strspn.c b/src/string/strspn.c
index 59b063e..9543dad 100644 (file)
--- 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;
 }