SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

strv: rename strv_endswith to endswith_strv and dedup ENDSWITH_SET

Browse Source
This commit is contained in:
Mike Yuan
2024-01-04 16:51:57 +08:00
parent eba8b54130
commit 2e6f012bf0
4 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/strv.c
+10 -10
View File
@@ -716,6 +716,16 @@ char* startswith_strv(const char *s, char * const *l) {
return NULL;
}
char* endswith_strv(const char *s, char * const *l) {
STRV_FOREACH(i, l) {
char *found = endswith(s, *i);
if (found)
return found;
}
return NULL;
}
char** strv_reverse(char **l) {
size_t n;
@@ -915,13 +925,3 @@ int _string_strv_ordered_hashmap_put(OrderedHashmap **h, const char *key, const
}
DEFINE_HASH_OPS_FULL(string_strv_hash_ops, char, string_hash_func, string_compare_func, free, char*, strv_free);
char* strv_endswith(const char *s, char **l) {
STRV_FOREACH(i, l) {
char *e = endswith(s, *i);
if (e)
return (char*) e;
}
return NULL;
}
src/basic/strv.h
+5 -14
View File
@@ -164,6 +164,11 @@ char* startswith_strv(const char *s, char * const *l);
#define STARTSWITH_SET(p, ...) \
startswith_strv(p, STRV_MAKE(__VA_ARGS__))
char* endswith_strv(const char *s, char * const *l);
#define ENDSWITH_SET(p, ...) \
endswith_strv(p, STRV_MAKE(__VA_ARGS__))
#define strv_from_stdarg_alloca(first) \
({ \
char **_l; \
@@ -207,18 +212,6 @@ char* startswith_strv(const char *s, char * const *l);
_x && strv_contains_case(STRV_MAKE(__VA_ARGS__), _x); \
})
#define ENDSWITH_SET(p, ...) \
({ \
const char *_p = (p); \
char *_found = NULL; \
STRV_FOREACH(_i, STRV_MAKE(__VA_ARGS__)) { \
_found = endswith(_p, *_i); \
if (_found) \
break; \
} \
_found; \
})
#define _FOREACH_STRING(uniq, x, y, ...) \
for (const char *x, * const*UNIQ_T(l, uniq) = STRV_MAKE_CONST(({ x = y; }), ##__VA_ARGS__); \
x; \
@@ -257,5 +250,3 @@ int _string_strv_hashmap_put(Hashmap **h, const char *key, const char *value HA
int _string_strv_ordered_hashmap_put(OrderedHashmap **h, const char *key, const char *value HASHMAP_DEBUG_PARAMS);
#define string_strv_hashmap_put(h, k, v) _string_strv_hashmap_put(h, k, v HASHMAP_DEBUG_SRC_ARGS)
#define string_strv_ordered_hashmap_put(h, k, v) _string_strv_ordered_hashmap_put(h, k, v HASHMAP_DEBUG_SRC_ARGS)
char* strv_endswith(const char *s, char **l);