morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

string-util: Add startswith_strv()

Browse Source 
This is the function version of STARTSWITH_SET(). We also move
STARTSWITH_SET() to string-util.h as it fits more there than in
strv.h and reimplement it using startswith_strv().
This commit is contained in:
Daan De Meyer
2023-04-18 13:11:45 +02:00
parent 85003d1296
commit 70cc7ed97e
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/basic/string-util.c
View File

@@ -1283,3 +1283,15 @@ char *find_line_startswith(const char *haystack, const char *needle) {
return p + strlen(needle);
}
char *startswith_strv(const char *string, char **strv) {
char *found = NULL;
STRV_FOREACH(i, strv) {
found = startswith(string, *i);
if (found)
break;
}
return found;
}

5
src/basic/string-util.h
View File

@@ -267,3 +267,8 @@ char *strdupspn(const char *a, const char *accept);
char *strdupcspn(const char *a, const char *reject);
char *find_line_startswith(const char *haystack, const char *needle);
char *startswith_strv(const char *string, char **strv);
#define STARTSWITH_SET(p, ...) \
startswith_strv(p, STRV_MAKE(__VA_ARGS__))

12
src/basic/strv.h
View File

@@ -200,18 +200,6 @@ static inline void strv_print(char * const *l) {
_x && strv_contains_case(STRV_MAKE(__VA_ARGS__), _x); \
})
#define STARTSWITH_SET(p, ...) \
({ \
const char *_p = (p); \
char *_found = NULL; \
STRV_FOREACH(_i, STRV_MAKE(__VA_ARGS__)) { \
_found = startswith(_p, *_i); \
if (_found) \
break; \
} \
_found; \
})
#define ENDSWITH_SET(p, ...) \
({ \
const char *_p = (p); \