diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2016-08-11 00:44:42 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-11 00:44:42 -0300 |
commit | d3f575264be46e518219c981ce09203f8b580921 (patch) | |
tree | aa805f4b034262f515352863a943c87fcc0954bf | |
parent | b269eb24b09d48cbbcdbb7a68e122d49cb39d0f1 (diff) | |
parent | bf35921abb2ad863b3f49b37c2559600304e451e (diff) |
Merge pull request #537 from Explorer09/string-utils
Optimize Strings_startWith()
-rw-r--r-- | StringUtils.c | 7 | ||||
-rw-r--r-- | StringUtils.h | 7 | ||||
-rw-r--r-- | linux/Battery.c | 22 | ||||
-rw-r--r-- | linux/Battery.h | 7 |
4 files changed, 15 insertions, 28 deletions
diff --git a/StringUtils.c b/StringUtils.c index b53f5eea..9547a07e 100644 --- a/StringUtils.c +++ b/StringUtils.c @@ -17,10 +17,15 @@ in the source distribution for its full text. /*{ #include <stdio.h> -#define String_startsWith(s, match) (strstr((s), (match)) == (s)) +#define String_startsWith(s, match) (strncmp((s),(match),strlen(match)) == 0) #define String_contains_i(s1, s2) (strcasestr(s1, s2) != NULL) }*/ +/* + * String_startsWith gives better performance if strlen(match) can be computed + * at compile time (e.g. when they are immutable string literals). :) + */ + char* String_cat(const char* s1, const char* s2) { int l1 = strlen(s1); int l2 = strlen(s2); diff --git a/StringUtils.h b/StringUtils.h index 97620342..d3378b38 100644 --- a/StringUtils.h +++ b/StringUtils.h @@ -11,9 +11,14 @@ in the source distribution for its full text. #include <stdio.h> -#define String_startsWith(s, match) (strstr((s), (match)) == (s)) +#define String_startsWith(s, match) (strncmp((s),(match),strlen(match)) == 0) #define String_contains_i(s1, s2) (strcasestr(s1, s2) != NULL) +/* + * String_startsWith gives better performance if strlen(match) can be computed + * at compile time (e.g. when they are immutable string literals). :) + */ + char* String_cat(const char* s1, const char* s2); char* String_trim(const char* in); diff --git a/linux/Battery.c b/linux/Battery.c index 10681844..b7a004ba 100644 --- a/linux/Battery.c +++ b/linux/Battery.c @@ -179,25 +179,6 @@ static inline ssize_t xread(int fd, void *buf, size_t count) { } } -/** - * Returns a pointer to the suffix of `str` if its beginning matches `prefix`. - * Returns NULL if the prefix does not match. - * Examples: - * match("hello world", "hello "); -> "world" - * match("hello world", "goodbye "); -> NULL - */ -static inline const char* match(const char* str, const char* prefix) { - for (;;) { - if (*prefix == '\0') { - return str; - } - if (*prefix != *str) { - return NULL; - } - prefix++; str++; - } -} - static void Battery_getSysData(double* level, ACPresence* isOnAC) { *level = 0; @@ -240,6 +221,8 @@ static void Battery_getSysData(double* level, ACPresence* isOnAC) { bool full = false; bool now = false; while ((line = strsep(&buf, "\n")) != NULL) { + #define match(str,prefix) \ + (String_startsWith(str,prefix) ? (str) + strlen(prefix) : NULL) const char* ps = match(line, "POWER_SUPPLY_"); if (!ps) { continue; @@ -266,6 +249,7 @@ static void Battery_getSysData(double* level, ACPresence* isOnAC) { continue; } } + #undef match } else if (entryName[0] == 'A') { if (*isOnAC != AC_ERROR) { continue; diff --git a/linux/Battery.h b/linux/Battery.h index 4cb22a89..cfb6c324 100644 --- a/linux/Battery.h +++ b/linux/Battery.h @@ -29,13 +29,6 @@ Linux battery readings written by Ian P. Hands (iphands@gmail.com, ihands@redhat // READ FROM /sys // ---------------------------------------- -/** - * Returns a pointer to the suffix of `str` if its beginning matches `prefix`. - * Returns NULL if the prefix does not match. - * Examples: - * match("hello world", "hello "); -> "world" - * match("hello world", "goodbye "); -> NULL - */ void Battery_getData(double* level, ACPresence* isOnAC); #endif |