From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v3 08/12] config: do not use strbuf_split()
Date: Sat, 2 Aug 2025 23:53:00 -0700 [thread overview]
Message-ID: <20250803065304.3325286-9-gitster@pobox.com> (raw)
In-Reply-To: <20250803065304.3325286-1-gitster@pobox.com>
When parsing an old-style GIT_CONFIG_PARAMETERS environment
variable, the code parses key=value pairs by splitting them at '='
into an array of strbuf's. As strbuf_split() leaves the delimiter
at the end of the split piece, the code has to manually trim it.
If we split with string_list_split(), that becomes unnecessary.
Retire the use of strbuf_split() from this code path.
Note that the max parameter of string_list_split() is of
an ergonomically iffy design---it specifies the maximum number of
times the function is allowed to split, which means that in order to
split a text into up to 2 pieces, you have to pass 1, not 2.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
config.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/config.c b/config.c
index 8a2d0b7916..1769f15ee3 100644
--- a/config.c
+++ b/config.c
@@ -638,31 +638,28 @@ int git_config_parse_parameter(const char *text,
config_fn_t fn, void *data)
{
const char *value;
- struct strbuf **pair;
+ struct string_list pair = STRING_LIST_INIT_DUP;
int ret;
struct key_value_info kvi = KVI_INIT;
kvi_from_param(&kvi);
- pair = strbuf_split_str(text, '=', 2);
- if (!pair[0])
+ string_list_split(&pair, text, "=", 1);
+ if (!pair.nr)
return error(_("bogus config parameter: %s"), text);
- if (pair[0]->len && pair[0]->buf[pair[0]->len - 1] == '=') {
- strbuf_setlen(pair[0], pair[0]->len - 1);
- value = pair[1] ? pair[1]->buf : "";
- } else {
+ if (pair.nr == 1)
value = NULL;
- }
+ else
+ value = pair.items[1].string;
- strbuf_trim(pair[0]);
- if (!pair[0]->len) {
- strbuf_list_free(pair);
+ if (!*pair.items[0].string) {
+ string_list_clear(&pair, 0);
return error(_("bogus config parameter: %s"), text);
}
- ret = config_parse_pair(pair[0]->buf, value, &kvi, fn, data);
- strbuf_list_free(pair);
+ ret = config_parse_pair(pair.items[0].string, value, &kvi, fn, data);
+ string_list_clear(&pair, 0);
return ret;
}
--
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 ` [PATCH v3 05/12] clean: do not use strbuf_split*() [part 2] Junio C Hamano
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 ` Junio C Hamano [this message]
2025-08-03 6:53 ` [PATCH v3 09/12] environment: " 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-9-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).