From: Patrick Steinhardt <ps@pks.im>
To: git@vger.kernel.org
Subject: [PATCH 1/2] config: extract function to parse config pairs
Date: Fri, 13 Nov 2020 13:16:18 +0100 [thread overview]
Message-ID: <6ced4b2ddd21828a21e935942e2c3da4deb34705.1605269465.git.ps@pks.im> (raw)
In-Reply-To: <cover.1605269465.git.ps@pks.im>
[-- Attachment #1: Type: text/plain, Size: 1819 bytes --]
The function `git_config_parse_parameter` is responsible for parsing a
`foo.bar=baz`-formatted configuration key, sanitizing the key and then
processing it via the given callback function. Given that we're about to
add a second user which is going to process keys in such which already
has keys and values separated, this commit extracts a function
`config_parse_pair` which only does the sanitization and processing
part.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
config.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/config.c b/config.c
index 2bdff4457b..3281b1374e 100644
--- a/config.c
+++ b/config.c
@@ -437,11 +437,26 @@ int git_config_key_is_valid(const char *key)
return !git_config_parse_key_1(key, NULL, NULL, 1);
}
+static int config_parse_pair(const char *key, const char *value,
+ config_fn_t fn, void *data)
+{
+ char *canonical_name;
+ int ret;
+
+ if (!strlen(key))
+ return error(_("empty config key"));
+ if (git_config_parse_key(key, &canonical_name, NULL))
+ return -1;
+
+ ret = (fn(canonical_name, value, data) < 0) ? -1 : 0;
+ free(canonical_name);
+ return ret;
+}
+
int git_config_parse_parameter(const char *text,
config_fn_t fn, void *data)
{
const char *value;
- char *canonical_name;
struct strbuf **pair;
int ret;
@@ -462,12 +477,7 @@ int git_config_parse_parameter(const char *text,
return error(_("bogus config parameter: %s"), text);
}
- if (git_config_parse_key(pair[0]->buf, &canonical_name, NULL)) {
- ret = -1;
- } else {
- ret = (fn(canonical_name, value, data) < 0) ? -1 : 0;
- free(canonical_name);
- }
+ ret = config_parse_pair(pair[0]->buf, value, fn, data);
strbuf_list_free(pair);
return ret;
}
--
2.29.2
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-11-13 12:16 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 12:16 [PATCH 0/2] config: allow specifying config entries via envvar pairs Patrick Steinhardt
2020-11-13 12:16 ` Patrick Steinhardt [this message]
2020-11-13 12:16 ` [PATCH 2/2] " Patrick Steinhardt
2020-11-13 13:04 ` Ævar Arnfjörð Bjarmason
2020-11-16 19:39 ` Junio C Hamano
2020-11-17 2:34 ` Jeff King
2020-11-17 6:37 ` Patrick Steinhardt
2020-11-17 7:01 ` Jeff King
2020-11-17 14:22 ` Ævar Arnfjörð Bjarmason
2020-11-17 23:57 ` Jeff King
2020-11-18 13:44 ` Ævar Arnfjörð Bjarmason
2020-11-18 0:50 ` brian m. carlson
2020-11-18 1:59 ` Jeff King
2020-11-18 2:25 ` brian m. carlson
2020-11-18 7:04 ` Patrick Steinhardt
2020-11-19 2:11 ` brian m. carlson
2020-11-19 6:37 ` Patrick Steinhardt
2020-11-18 5:44 ` Junio C Hamano
2020-11-17 6:28 ` Patrick Steinhardt
2020-11-17 7:06 ` Junio C Hamano
2020-11-18 13:49 ` Ævar Arnfjörð Bjarmason
2020-11-18 13:56 ` Patrick Steinhardt
2020-11-18 16:01 ` Junio C Hamano
2020-11-17 14:03 ` Ævar Arnfjörð Bjarmason
2020-11-13 16:37 ` Philip Oakley
2020-11-17 6:40 ` Patrick Steinhardt
2020-11-13 13:11 ` [PATCH 0/2] " Ævar Arnfjörð Bjarmason
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6ced4b2ddd21828a21e935942e2c3da4deb34705.1605269465.git.ps@pks.im \
--to=ps@pks.im \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).