X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstring%2Fstrcspn.c;h=c843ff97476aedb4821fc41091689bfc8652fea2;hb=bac03cdde1137c16b4c194e137310e2748661dcc;hp=439b7be48abd5c47f625a6647c0c52c8adb40ceb;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl diff --git a/src/string/strcspn.c b/src/string/strcspn.c index 439b7be4..c843ff97 100644 --- a/src/string/strcspn.c +++ b/src/string/strcspn.c @@ -3,18 +3,16 @@ #define BITOP(a,b,op) \ ((a)[(size_t)(b)/(8*sizeof *(a))] op (size_t)1<<((size_t)(b)%(8*sizeof *(a)))) -size_t strcspn(const char *_s, const char *_c) +size_t strcspn(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)]; if (!c[0]) return strlen(s); if (!c[1]) return (s=strchr(s, *c)) ? s-a : strlen(a); memset(byteset, 0, sizeof byteset); - 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; }