diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-02-15 17:40:40 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-02-15 17:40:40 +0000 |
commit | a896ca2a8c617e5e00ffd5fc9e69331ad754e5b3 (patch) | |
tree | f49a8382b9999b5aa00c0885eedd5c5c3a233e55 /src/libstddjb/case_str.c | |
parent | 00c9cb1b22cc17c4db573e0e613a5f116ff0092e (diff) | |
download | skalibs-a896ca2a8c617e5e00ffd5fc9e69331ad754e5b3.tar.xz |
add arc4random_addrandom sysdep; next batch of types changes.
The library isn't supposed to be functional yet: there are
still a lot of type mismatches.
Diffstat (limited to 'src/libstddjb/case_str.c')
-rw-r--r-- | src/libstddjb/case_str.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/libstddjb/case_str.c b/src/libstddjb/case_str.c index 14409c3..a6cd9b4 100644 --- a/src/libstddjb/case_str.c +++ b/src/libstddjb/case_str.c @@ -1,32 +1,33 @@ /* ISC license. */ -#include <skalibs/config.h> #include <skalibs/sysdeps.h> -#if defined(SKALIBS_HASSTRCASESTR) && !defined(SKALIBS_FLAG_REPLACE_LIBC) +#ifdef SKALIBS_HASSTRCASESTR #include <skalibs/nonposix.h> #include <string.h> #include <skalibs/bytestr.h> -unsigned int case_str (char const *haystack, char const *needle) +size_t case_str (char const *haystack, char const *needle) { register char *p = strcasestr(haystack, needle) ; - return p ? p - haystack : str_len(haystack) ; + return p ? p - haystack : strlen(haystack) ; } #else +#include <sys/types.h> +#include <string.h> #include <skalibs/bytestr.h> -unsigned int case_str (char const *haystack, char const *needle) +size_t case_str (char const *haystack, char const *needle) { - unsigned int nlen = str_len(needle) ; - register char const *p = haystack ; + size_t nlen = strlen(needle) ; + char const *p = haystack ; if (!nlen) return 0 ; for (; *p ; p++) if (!case_diffb(p, nlen, needle)) return p - haystack ; - return str_len(haystack) ; + return strlen(haystack) ; } #endif |