diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-01 15:04:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-02 22:29:27 -0700 |
| commit | 9f6dfe43c8a55b833ae16486bcafe29b543461f9 (patch) | |
| tree | 8183419676481f415c0227d43c724e4524457156 /string-list.c | |
| parent | string-list: report programming error with BUG (diff) | |
| download | git-9f6dfe43c8a55b833ae16486bcafe29b543461f9.tar.gz git-9f6dfe43c8a55b833ae16486bcafe29b543461f9.zip | |
string-list: align string_list_split() with its _in_place() counterpart
The string_list_split_in_place() function was updated by 52acddf3
(string-list: multi-delimiter `string_list_split_in_place()`,
2023-04-24) to take more than one delimiter characters, hoping that
we can later use it to replace our uses of strtok(). We however did
not make a matching change to the string_list_split() function,
which is very similar.
Before giving both functions more features in future commits, allow
string_list_split() to also take more than one delimiter characters
to make them closer to each other.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'string-list.c')
| -rw-r--r-- | string-list.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/string-list.c b/string-list.c index 0cb920e9b0..2284a009cb 100644 --- a/string-list.c +++ b/string-list.c @@ -277,7 +277,7 @@ void unsorted_string_list_delete_item(struct string_list *list, int i, int free_ } int string_list_split(struct string_list *list, const char *string, - int delim, int maxsplit) + const char *delim, int maxsplit) { int count = 0; const char *p = string, *end; @@ -291,7 +291,7 @@ int string_list_split(struct string_list *list, const char *string, string_list_append(list, p); return count; } - end = strchr(p, delim); + end = strpbrk(p, delim); if (end) { string_list_append_nodup(list, xmemdupz(p, end - p)); p = end + 1; |
