diff options
| -rw-r--r-- | src/shared/util.c | 47 | ||||
| -rw-r--r-- | src/shared/util.h | 4 |
2 files changed, 22 insertions, 29 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index a73443d535..db8e75b628 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -216,45 +216,38 @@ char* endswith(const char *s, const char *postfix) { return (char*) s + sl - pl; } -bool startswith(const char *s, const char *prefix) { - size_t sl, pl; +char* startswith(const char *s, const char *prefix) { + const char *a, *b; assert(s); assert(prefix); - sl = strlen(s); - pl = strlen(prefix); - - if (pl == 0) - return true; - - if (sl < pl) - return false; + a = s, b = prefix; + for (;;) { + if (*b == 0) + return (char*) a; + if (*a != *b) + return NULL; - return memcmp(s, prefix, pl) == 0; + a++, b++; + } } -bool startswith_no_case(const char *s, const char *prefix) { - size_t sl, pl; - unsigned i; +char* startswith_no_case(const char *s, const char *prefix) { + const char *a, *b; assert(s); assert(prefix); - sl = strlen(s); - pl = strlen(prefix); - - if (pl == 0) - return true; - - if (sl < pl) - return false; - - for(i = 0; i < pl; ++i) - if (tolower(s[i]) != tolower(prefix[i])) - return false; + a = s, b = prefix; + for (;;) { + if (*b == 0) + return (char*) a; + if (tolower(*a) != tolower(*b)) + return NULL; - return true; + a++, b++; + } } bool first_word(const char *s, const char *word) { diff --git a/src/shared/util.h b/src/shared/util.h index 8935beea2b..f6a4c1ea6c 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -142,8 +142,8 @@ static inline bool isempty(const char *p) { } char *endswith(const char *s, const char *postfix); -bool startswith(const char *s, const char *prefix); -bool startswith_no_case(const char *s, const char *prefix); +char *startswith(const char *s, const char *prefix); +char *startswith_no_case(const char *s, const char *prefix); bool first_word(const char *s, const char *word); |