Two related string-list API functions, string_list_split() and
string_list_split_in_place(), more or less duplicates their
implementations. They both take a single string, and split the
string at the delimiter and stuff the result into a string list.
However, there is one subtle and unnecessary difference. The non
"in-place" variant only allows a single byte value as delimiter,
while the "in-place" variant can take multiple delimiters (e.g.,
"split at either a comma or a space").
This series first updates the string_list_split() to allow multiple
delimiters like string_list_split_in_place() does, by unifying their
implementations into one. This refactoring allows us to give new
features to these two functions more easily.
Then these functions learn to optionally
- trim the split string pieces before placing them in the resulting
string list.
- omit empty string pieces from the resulting string list.
An existing caller of string_list_split() in diff.c trims the
elements in the resulting string list before it uses them, which is
simplified by taking advantage of this new feature.
A handful of code paths call string_list_split*(), immediately
followed by string_list_remove_empty_items(). They are simplified
by not placing empty items in the list in the first place.
Relative to the v2 iteration, the v3 iteration switches from CPP
macros to enum for flag bits, and corrects a handful of typos.
Junio C Hamano (7):
string-list: report programming error with BUG
string-list: align string_list_split() with its _in_place()
counterpart
string-list: unify string_list_split* functions
string-list: optionally trim string pieces split by
string_list_split*()
diff: simplify parsing of diff.colormovedws
string-list: optionally omit empty string pieces in
string_list_split*()
string-list: split-then-remove-empty can be done while splitting
builtin/blame.c | 2 +-
builtin/merge.c | 2 +-
builtin/var.c | 2 +-
connect.c | 2 +-
diff.c | 20 ++----
fetch-pack.c | 2 +-
notes.c | 6 +-
parse-options.c | 2 +-
pathspec.c | 3 +-
protocol.c | 2 +-
ref-filter.c | 4 +-
setup.c | 3 +-
string-list.c | 120 ++++++++++++++++++++++++-----------
string-list.h | 30 ++++++---
t/helper/test-hashmap.c | 4 +-
t/helper/test-json-writer.c | 4 +-
t/helper/test-path-utils.c | 3 +-
t/helper/test-ref-store.c | 2 +-
t/unit-tests/u-string-list.c | 95 ++++++++++++++++++++++++---
transport.c | 2 +-
upload-pack.c | 2 +-
21 files changed, 222 insertions(+), 90 deletions(-)
Range-diff against v2:
1: 1c2b222eec = 1: 442ed679bb string-list: report programming error with BUG
2: a7e07b94ef = 2: cc80bac8c2 string-list: align string_list_split() with its _in_place() counterpart
3: b7a7fbb975 = 3: c7922b3e14 string-list: unify string_list_split* functions
4: c566d88c28 ! 4: 9d7d22e8ef string-list: optionally trim string pieces split by string_list_split*()
@@ string-list.h: int string_list_split(struct string_list *list, const char *strin
int string_list_split_in_place(struct string_list *list, char *string,
const char *delim, int maxsplit);
+
-+/* trim() resulting string piece before adding it to the list */
-+#define STRING_LIST_SPLIT_TRIM 01
++/* flag bits for split_f and split_in_place_f functions */
++enum {
++ /* trim() resulting string piece before adding it to the list */
++ STRING_LIST_SPLIT_TRIM = (1 << 0),
++};
+
+int string_list_split_f(struct string_list *, const char *string,
+ const char *delim, int maxsplit, unsigned flags);
+
+int string_list_split_in_place_f(struct string_list *, char *string,
+ const char *delim, int maxsplit, unsigned flags);
-+
#endif /* STRING_LIST_H */
## t/unit-tests/u-string-list.c ##
5: eb272e0f22 ! 5: ad8b425bc5 diff: simplify parsing of diff.colormovedws
@@ Commit message
diff: simplify parsing of diff.colormovedws
The code to parse this configuration variable, whose value is a
- comma separated known tokens like "ignore-space-change" and
+ comma-separated list of known tokens like "ignore-space-change" and
"ignore-all-space", uses string_list_split() to split the value into
pieces, and then places each piece of string in a strbuf to trim,
before comparing the result with the list of known tokens.
6: d418078a84 ! 6: d03f443878 string-list: optionally omit empty string pieces in string_list_split*()
@@ Commit message
string-list: optionally omit empty string pieces in string_list_split*()
Teach the unified split_string() machinery a new flag bit,
- STRING_LIST_SPLIT_NONEMPTY, to cause empty split pieces omitted from
- the resulting string list.
+ STRING_LIST_SPLIT_NONEMPTY, to cause empty split pieces to be
+ omitted from the resulting string list.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
@@ string-list.c: static int append_one(struct string_list *list,
## string-list.h ##
@@ string-list.h: int string_list_split_in_place(struct string_list *list, char *string,
- /* trim() resulting string piece before adding it to the list */
- #define STRING_LIST_SPLIT_TRIM 01
+ enum {
+ /* trim() resulting string piece before adding it to the list */
+ STRING_LIST_SPLIT_TRIM = (1 << 0),
++ /* omit adding empty string piece to the resulting list */
++ STRING_LIST_SPLIT_NONEMPTY = (1 << 1),
+ };
-+/* omit adding empty string piece to the resulting list */
-+#define STRING_LIST_SPLIT_NONEMPTY 02
-+
int string_list_split_f(struct string_list *, const char *string,
- const char *delim, int maxsplit, unsigned flags);
-
## t/unit-tests/u-string-list.c ##
@@ t/unit-tests/u-string-list.c: void test_string_list__split_f(void)
7: 12c1189a08 = 7: 9eb8d87d62 string-list: split-then-remove-empty can be done while splitting
--
2.50.1-633-g85c5610de3
