From 9ae8d5fc71a4b61ec826d58f03f7b543755fb1d4 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 25 Mar 2011 16:34:03 -0400 Subject: 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. --- src/string/strcspn.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/string/strcspn.c') 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; } -- cgit v1.2.1