mirror of https://github.com/xzeldon/htop.git
Merge pull request #537 from Explorer09/string-utils
Optimize Strings_startWith()
This commit is contained in:
commit
d3f575264b
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue