projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
silence nonsensical warnings in timer_create
[musl]
/
src
/
string
/
strcspn.c
diff --git
a/src/string/strcspn.c
b/src/string/strcspn.c
index
439b7be
..
cfdba11
100644
(file)
--- a/
src/string/strcspn.c
+++ b/
src/string/strcspn.c
@@
-3,18
+3,17
@@
#define BITOP(a,b,op) \
((a)[(size_t)(b)/(8*sizeof *(a))] op (size_t)1<<((size_t)(b)%(8*sizeof *(a))))
#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)
+char *__strchrnul(const char *, int);
+
+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)];
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);
+ if (!c[0] || !c[1]) return __strchrnul(s, *c)-a;
memset(byteset, 0, sizeof byteset);
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;
}
return s-a;
}