From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v3 05/12] clean: do not use strbuf_split*() [part 2]
Date: Sat, 2 Aug 2025 23:52:57 -0700 [thread overview]
Message-ID: <20250803065304.3325286-6-gitster@pobox.com> (raw)
In-Reply-To: <20250803065304.3325286-1-gitster@pobox.com>
builtin/clean.c:filter_by_patterns_cmd() interactively reads a line
that has exclude patterns from the user and splits the line into a
list of patterns. It uses the strbuf_split() so that each split
piece can then trimmed.
There is no need to use strbuf anymore, thanks to the recent
enhancement to string_list_split*() family that allows us to trim
the pieces split into a string_list.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/clean.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index 9bb920e7fd..38780edc39 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -674,12 +674,13 @@ static int filter_by_patterns_cmd(void)
{
struct dir_struct dir = DIR_INIT;
struct strbuf confirm = STRBUF_INIT;
- struct strbuf **ignore_list;
- struct string_list_item *item;
struct pattern_list *pl;
int changed = -1, i;
for (;;) {
+ struct string_list ignore_list = STRING_LIST_INIT_NODUP;
+ struct string_list_item *item;
+
if (!del_list.nr)
break;
@@ -697,14 +698,15 @@ static int filter_by_patterns_cmd(void)
break;
pl = add_pattern_list(&dir, EXC_CMDL, "manual exclude");
- ignore_list = strbuf_split_max(&confirm, ' ', 0);
- for (i = 0; ignore_list[i]; i++) {
- strbuf_trim(ignore_list[i]);
- if (!ignore_list[i]->len)
- continue;
+ string_list_split_in_place_f(&ignore_list, confirm.buf, " ", -1,
+ STRING_LIST_SPLIT_TRIM);
- add_pattern(ignore_list[i]->buf, "", 0, pl, -(i+1));
+ for (i = 0; i < ignore_list.nr; i++) {
+ item = &ignore_list.items[i];
+ if (!*item->string)
+ continue;
+ add_pattern(item->string, "", 0, pl, -(i+1));
}
changed = 0;
@@ -725,7 +727,7 @@ static int filter_by_patterns_cmd(void)
clean_print_color(CLEAN_COLOR_RESET);
}
- strbuf_list_free(ignore_list);
+ string_list_clear(&ignore_list, 0);
dir_clear(&dir);
}
--
2.50.1-633-g69dfdd50af
next prev parent reply other threads:[~2025-08-03 6:53 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-31 6:39 [PATCH 0/5] string_list_split*() updates Junio C Hamano
2025-07-31 6:39 ` [PATCH 1/5] string-list: report programming error with BUG Junio C Hamano
2025-07-31 19:33 ` Eric Sunshine
2025-07-31 22:16 ` Junio C Hamano
2025-07-31 6:39 ` [PATCH 2/5] string-list: align string_list_split() with its _in_place() counterpart Junio C Hamano
2025-07-31 19:36 ` Eric Sunshine
2025-07-31 6:39 ` [PATCH 3/5] string-list: unify string_list_split* functions Junio C Hamano
2025-07-31 6:39 ` [PATCH 4/5] string-list: optionally trim string pieces split by string_list_split() Junio C Hamano
2025-07-31 6:39 ` [PATCH 5/5] diff: simplify parsing of diff.colormovedws Junio C Hamano
2025-07-31 19:45 ` Eric Sunshine
2025-07-31 22:45 ` [PATCH v2 0/7] string_list_split*() updates Junio C Hamano
2025-07-31 22:46 ` [PATCH v2 1/7] string-list: report programming error with BUG Junio C Hamano
2025-07-31 22:46 ` [PATCH v2 2/7] string-list: align string_list_split() with its _in_place() counterpart Junio C Hamano
2025-08-01 2:33 ` shejialuo
2025-08-01 3:43 ` Junio C Hamano
2025-08-01 3:55 ` shejialuo
2025-08-01 23:10 ` Junio C Hamano
2025-07-31 22:46 ` [PATCH v2 3/7] string-list: unify string_list_split* functions Junio C Hamano
2025-08-01 3:00 ` shejialuo
2025-07-31 22:46 ` [PATCH v2 4/7] string-list: optionally trim string pieces split by string_list_split*() Junio C Hamano
2025-08-01 3:18 ` shejialuo
2025-08-01 3:47 ` Junio C Hamano
2025-08-01 4:04 ` shejialuo
2025-08-01 23:09 ` Junio C Hamano
2025-08-02 1:51 ` shejialuo
2025-08-01 8:47 ` Patrick Steinhardt
2025-08-01 16:26 ` Junio C Hamano
2025-07-31 22:46 ` [PATCH v2 5/7] diff: simplify parsing of diff.colormovedws Junio C Hamano
2025-08-01 8:47 ` Patrick Steinhardt
2025-07-31 22:46 ` [PATCH v2 6/7] string-list: optionally omit empty string pieces in string_list_split*() Junio C Hamano
2025-07-31 22:54 ` Eric Sunshine
2025-08-01 3:33 ` shejialuo
2025-08-01 8:47 ` Patrick Steinhardt
2025-08-01 16:38 ` Junio C Hamano
2025-07-31 22:46 ` [PATCH v2 7/7] string-list: split-then-remove-empty can be done while splitting Junio C Hamano
2025-08-01 8:47 ` Patrick Steinhardt
2025-08-01 22:04 ` [PATCH v3 0/7] string_list_split*() updates Junio C Hamano
2025-08-01 22:04 ` [PATCH v3 1/7] string-list: report programming error with BUG Junio C Hamano
2025-08-01 22:04 ` [PATCH v3 2/7] string-list: align string_list_split() with its _in_place() counterpart Junio C Hamano
2025-08-02 8:22 ` Jeff King
2025-08-02 16:34 ` Junio C Hamano
2025-08-02 18:38 ` Jeff King
2025-08-01 22:04 ` [PATCH v3 3/7] string-list: unify string_list_split* functions Junio C Hamano
2025-08-01 22:04 ` [PATCH v3 4/7] string-list: optionally trim string pieces split by string_list_split*() Junio C Hamano
2025-08-02 8:26 ` Jeff King
2025-08-02 16:38 ` Junio C Hamano
2025-08-02 18:39 ` Jeff King
2025-08-01 22:04 ` [PATCH v3 5/7] diff: simplify parsing of diff.colormovedws Junio C Hamano
2025-08-01 22:04 ` [PATCH v3 6/7] string-list: optionally omit empty string pieces in string_list_split*() Junio C Hamano
2025-08-01 22:04 ` [PATCH v3 7/7] string-list: split-then-remove-empty can be done while splitting Junio C Hamano
2025-08-03 6:52 ` [PATCH v4 0/7] string_list_split*() updates Junio C Hamano
2025-08-03 6:52 ` [PATCH v4 1/7] string-list: report programming error with BUG Junio C Hamano
2025-08-03 6:52 ` [PATCH v4 2/7] string-list: align string_list_split() with its _in_place() counterpart Junio C Hamano
2025-08-03 6:52 ` [PATCH v4 3/7] string-list: unify string_list_split* functions Junio C Hamano
2025-08-03 6:52 ` [PATCH v4 4/7] string-list: optionally trim string pieces split by string_list_split*() Junio C Hamano
2025-08-03 6:52 ` [PATCH v4 5/7] diff: simplify parsing of diff.colormovedws Junio C Hamano
2025-08-03 6:52 ` [PATCH v4 6/7] string-list: optionally omit empty string pieces in string_list_split*() Junio C Hamano
2025-08-03 6:52 ` [PATCH v4 7/7] string-list: split-then-remove-empty can be done while splitting Junio C Hamano
2025-08-04 6:24 ` [PATCH v4 0/7] string_list_split*() updates Patrick Steinhardt
2025-08-03 6:52 ` [PATCH v3 00/12] do not overuse strbuf_split*() Junio C Hamano
2025-08-03 6:52 ` [PATCH v3 01/12] wt-status: avoid strbuf_split*() Junio C Hamano
2025-08-03 6:52 ` [PATCH v3 02/12] clean: do not pass strbuf by value Junio C Hamano
2025-08-03 6:52 ` [PATCH v3 03/12] clean: do not use strbuf_split*() [part 1] Junio C Hamano
2025-08-03 6:52 ` [PATCH v3 04/12] clean: do not pass the whole structure when it is not necessary Junio C Hamano
2025-08-03 6:52 ` Junio C Hamano [this message]
2025-08-03 6:52 ` [PATCH v3 06/12] merge-tree: do not use strbuf_split*() Junio C Hamano
2025-08-03 6:52 ` [PATCH v3 07/12] notes: " Junio C Hamano
2025-08-03 6:53 ` [PATCH v3 08/12] config: do not use strbuf_split() Junio C Hamano
2025-08-03 6:53 ` [PATCH v3 09/12] environment: do not use strbuf_split*() Junio C Hamano
2025-08-03 6:53 ` [PATCH v3 10/12] sub-process: " Junio C Hamano
2025-08-03 6:53 ` [PATCH v3 11/12] trace2: trim_trailing_newline followed by trim is a no-op Junio C Hamano
2025-08-03 6:53 ` [PATCH v3 12/12] trace2: do not use strbuf_split*() Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250803065304.3325286-6-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).