summaryrefslogtreecommitdiff
path: root/src/string/strspn.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-03-25 16:34:03 -0400
committerRich Felker <dalias@aerifal.cx>2011-03-25 16:34:03 -0400
commit9ae8d5fc71a4b61ec826d58f03f7b543755fb1d4 (patch)
treea712bede2bb0cef734418927fee7704732628e83 /src/string/strspn.c
parenta37452430f93700aeb122d693959ad79d8e43ada (diff)
downloadmusl-9ae8d5fc71a4b61ec826d58f03f7b543755fb1d4.tar.gz
musl-9ae8d5fc71a4b61ec826d58f03f7b543755fb1d4.tar.bz2
musl-9ae8d5fc71a4b61ec826d58f03f7b543755fb1d4.tar.xz
musl-9ae8d5fc71a4b61ec826d58f03f7b543755fb1d4.zip
fix all implicit conversion between signed/unsigned pointers
sadly the C language does not specify any such implicit conversion, so this is not a matter of just fixing warnings (as gcc treats it) but actual errors. i would like to revisit a number of these changes and possibly revise the types used to reduce the number of casts required.
Diffstat (limited to 'src/string/strspn.c')
-rw-r--r--src/string/strspn.c10
1 files changed, 4 insertions, 6 deletions
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;
}