admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

string-list: optionally trim string pieces split by string_list_split*()

Browse Source 
Teach the unified split_string() to take an optional "flags" word,
and define the first flag STRING_LIST_SPLIT_TRIM to cause the split
pieces to be trimmed before they are placed in the string list.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2025-08-01 15:04:20 -07:00
parent 527535fcdd
commit 5764549741
3 changed files with 109 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
t/unit-tests/u-string-list.c
View File

@@ -63,6 +63,70 @@ static void t_string_list_split(const char *data, const char *delim, int maxspli
string_list_clear(&list, 0);
}
static void t_string_list_split_f(const char *data, const char *delim,
int maxsplit, unsigned flags, ...)
{
struct string_list expected_strings = STRING_LIST_INIT_DUP;
struct string_list list = STRING_LIST_INIT_DUP;
va_list ap;
int len;
va_start(ap, flags);
t_vcreate_string_list_dup(&expected_strings, 0, ap);
va_end(ap);
string_list_clear(&list, 0);
len = string_list_split_f(&list, data, delim, maxsplit, flags);
cl_assert_equal_i(len, expected_strings.nr);
t_string_list_equal(&list, &expected_strings);
string_list_clear(&expected_strings, 0);
string_list_clear(&list, 0);
}
void test_string_list__split_f(void)
{
t_string_list_split_f("::foo:bar:baz:", ":", -1, 0,
"", "", "foo", "bar", "baz", "", NULL);
t_string_list_split_f(" foo:bar : baz", ":", -1, STRING_LIST_SPLIT_TRIM,
"foo", "bar", "baz", NULL);
t_string_list_split_f(" a b c ", " ", 1, STRING_LIST_SPLIT_TRIM,
"a", "b c", NULL);
}
static void t_string_list_split_in_place_f(const char *data_, const char *delim,
int maxsplit, unsigned flags, ...)
{
struct string_list expected_strings = STRING_LIST_INIT_DUP;
struct string_list list = STRING_LIST_INIT_NODUP;
char *data = xstrdup(data_);
va_list ap;
int len;
va_start(ap, flags);
t_vcreate_string_list_dup(&expected_strings, 0, ap);
va_end(ap);
string_list_clear(&list, 0);
len = string_list_split_in_place_f(&list, data, delim, maxsplit, flags);
cl_assert_equal_i(len, expected_strings.nr);
t_string_list_equal(&list, &expected_strings);
free(data);
string_list_clear(&expected_strings, 0);
string_list_clear(&list, 0);
}
void test_string_list__split_in_place_f(void)
{
t_string_list_split_in_place_f("::foo:bar:baz:", ":", -1, 0,
"", "", "foo", "bar", "baz", "", NULL);
t_string_list_split_in_place_f(" foo:bar : baz", ":", -1, STRING_LIST_SPLIT_TRIM,
"foo", "bar", "baz", NULL);
t_string_list_split_in_place_f(" a b c ", " ", 1, STRING_LIST_SPLIT_TRIM,
"a", "b c", NULL);
}
void test_string_list__split(void)
{
t_string_list_split("foo:bar:baz", ":", -1, "foo", "bar", "baz", NULL);