[PATCH 1/5] string-list: introduce `string_list_split_in_place_multi()`
- From
Taylor Blau <me@ttaylorr.com>
- Date
- Apr 13, 2023, 23:31 UTC
- Message-ID
- <dda218c8c1fdc0ca2e4352b820f3432565a74a23.1681428696.git.me@ttaylorr.com>
- In-Reply-To
- <cover.1681428696.git.me@ttaylorr.com>
Introduce a variant of the `string_list_split_in_place()` function that takes a string of accepted delimiters.
By contrast to its cousin `string_list_split_in_place()` which splits the given string at every instance of the single character `delim`, the `_multi` variant splits the given string any any character appearing in the string `delim`.
Instead of using `strchr(2)` to locate the first occurrence of the given delimiter character, `string_list_split_in_place_multi()` uses `strpbrk(2)` to find the first occurrence of *any* character in the given delimiter string.
Since the `_multi` variant is a generalization of the original implementation, reimplement `string_list_split_in_place()` in terms of the more general function by providing a single-character string for the list of accepted delimiters.
Signed-off-by: Taylor Blau <me@ttaylorr.com> --- string-list.c | 15 ++++++++++++--- string-list.h | 6 ++++++ 2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/string-list.c b/string-list.c index db473f273e1..67f9ff18904 100644 --- a/string-list.c +++ b/string-list.c @@ -300,8 +300,8 @@ int string_list_split(struct string_list *list, const char *string, } } -int string_list_split_in_place(struct string_list *list, char *string, - int delim, int maxsplit) +int string_list_split_in_place_multi(struct string_list *list, char *string, + const char *delim, int maxsplit) { int count = 0; char *p = string, *end; @@ -315,7 +315,7 @@ int string_list_split_in_place(struct string_list *list, char *string, string_list_append(list, p); return count; } - end = strchr(p, delim); + end = strpbrk(p, delim); if (end) { *end = '\0'; string_list_append(list, p); @@ -326,3 +326,12 @@ int string_list_split_in_place(struct string_list *list, char *string, } } } + +int string_list_split_in_place(struct string_list *list, char *string, + int delim, int maxsplit) +{ + char delim_s[2] = { delim, 0 }; + + return string_list_split_in_place_multi(list, string, delim_s, + maxsplit); +} diff --git a/string-list.h b/string-list.h index c7b0d5d0008..670d4fc8fb7 100644 --- a/string-list.h +++ b/string-list.h @@ -268,7 +268,13 @@ int string_list_split(struct string_list *list, const char *string, * new string_list_items point into string (which therefore must not * be modified or freed while the string_list is in use). * list->strdup_strings must *not* be set. + * + * The "_multi" variant splits the given string on any character + * appearing in "delim", and the non-"_multi" variant splits only on the + * given character. */ +int string_list_split_in_place_multi(struct string_list *list, char *string, + const char *delim, int maxsplit); int string_list_split_in_place(struct string_list *list, char *string, int delim, int maxsplit); #endif /* STRING_LIST_H */
-- 2.38.0.16.g393fd4c6db