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

strv: introduce strv_extend_joined() and strv_extend_joined_with_size()

Browse Source
This commit is contained in:
Yu Watanabe
2025-10-31 22:19:31 +09:00
parent 69350ee3e3
commit 19bbcd35d7
3 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/basic/strv.c
View File

@@ -921,6 +921,18 @@ int strv_extendf_with_size(char ***l, size_t *n, const char *format, ...) {
return strv_consume_with_size(l, n, x);
}
int strv_extend_joined_with_size_sentinel(char ***l, size_t *n, ...) {
va_list ap;
va_start(ap, n);
char *x = strextendv_with_separator(/* x= */ NULL, /* separator=*/ NULL, ap);
va_end(ap);
if (!x)
return -ENOMEM;
return strv_consume_with_size(l, n, x);
}
char* startswith_strv(const char *s, char * const *l) {
STRV_FOREACH(i, l) {
char *found = startswith(s, *i);

4
src/basic/strv.h
View File

@@ -59,6 +59,10 @@ int strv_extend_many_internal(char ***l, const char *value, ...);
int strv_extendf_with_size(char ***l, size_t *n, const char *format, ...) _printf_(3,4);
#define strv_extendf(l, ...) strv_extendf_with_size(l, NULL, __VA_ARGS__)
int strv_extend_joined_with_size_sentinel(char ***l, size_t *n, ...) _sentinel_;
#define strv_extend_joined_with_size(l, n, ...) strv_extend_joined_with_size_sentinel(l, n, __VA_ARGS__, NULL)
#define strv_extend_joined(l, ...) strv_extend_joined_with_size(l, NULL, __VA_ARGS__)
int strv_push_with_size(char ***l, size_t *n, char *value);
static inline int strv_push(char ***l, char *value) {
return strv_push_with_size(l, NULL, value);

24
src/test/test-strv.c
View File

@@ -762,6 +762,30 @@ TEST(strv_extendf_with_size) {
ASSERT_STREQ(a[1], "test3 bar foo 128");
}
TEST(strv_extend_joined) {
_cleanup_strv_free_ char **a = NULL;
ASSERT_OK(strv_extend_joined(&a, "hoge"));
ASSERT_OK(strv_extend_joined(&a, "aaa", "bbb", "ccc"));
ASSERT_EQ(strv_length(a), 2u);
ASSERT_STREQ(a[0], "hoge");
ASSERT_STREQ(a[1], "aaabbbccc");
}
TEST(strv_extend_joined_with_size) {
_cleanup_strv_free_ char **a = NULL;
size_t n = 0;
ASSERT_OK(strv_extend_joined_with_size(&a, &n, "hoge"));
ASSERT_OK(strv_extend_joined_with_size(&a, &n, "aaa", "bbb", "ccc"));
ASSERT_EQ(n, 2u);
ASSERT_EQ(strv_length(a), n);
ASSERT_STREQ(a[0], "hoge");
ASSERT_STREQ(a[1], "aaabbbccc");
}
TEST(strv_foreach) {
_cleanup_strv_free_ char **a;
unsigned i = 0;