From 8108652450621d1f5d8e2ecbac2e3ecc01e2272a Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 21 Aug 2013 21:57:06 +0200 Subject: [PATCH] replace startswith*() loop with optimizable inline fuction --- src/shared/util.c | 34 ---------------------------------- src/shared/util.h | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 36 deletions(-) diff --git a/src/shared/util.c b/src/shared/util.c index ca9c2eb..1dde8af 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -128,40 +128,6 @@ char* endswith(const char *s, const char *postfix) { return (char*) s + sl - pl; } -char* startswith(const char *s, const char *prefix) { - const char *a, *b; - - assert(s); - assert(prefix); - - a = s, b = prefix; - for (;;) { - if (*b == 0) - return (char*) a; - if (*a != *b) - return NULL; - - a++, b++; - } -} - -char* startswith_no_case(const char *s, const char *prefix) { - const char *a, *b; - - assert(s); - assert(prefix); - - a = s, b = prefix; - for (;;) { - if (*b == 0) - return (char*) a; - if (tolower(*a) != tolower(*b)) - return NULL; - - a++, b++; - } -} - bool first_word(const char *s, const char *word) { size_t sl, wl; diff --git a/src/shared/util.h b/src/shared/util.h index 3be692e..63f4e3d 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -106,9 +106,19 @@ static inline bool isempty(const char *p) { return !p || !p[0]; } +static inline const char *startswith(const char *s, const char *prefix) { + if (strncmp(s, prefix, strlen(prefix)) == 0) + return s + strlen(prefix); + return NULL; +} + +static inline const char *startswith_no_case(const char *s, const char *prefix) { + if (strncasecmp(s, prefix, strlen(prefix)) == 0) + return s + strlen(prefix); + return NULL; +} + char *endswith(const char *s, const char *postfix) _pure_; -char *startswith(const char *s, const char *prefix) _pure_; -char *startswith_no_case(const char *s, const char *prefix) _pure_; bool first_word(const char *s, const char *word) _pure_; -- 1.8.3.1