From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 3/8] builtin/config: extract `handle_value_regex()` from `get_value()`
Date: Wed, 13 Nov 2019 19:55:02 +0100 [thread overview]
Message-ID: <c4bcb32299291549d82c0544937a647c5000ad64.1573670565.git.martin.agren@gmail.com> (raw)
In-Reply-To: <cover.1573670565.git.martin.agren@gmail.com>
This is a self-contained and fairly large chunk of code which will soon
gain a few more lines. Prepare by extracting it into a separate
function.
This whole chunk is wrapped in "if (regex_)" -- rewrite it into an early
return path in the new helper function to reduce indentation.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
I copy the "xmalloc(sizeof(regex_t))" anti-pattern verbatim. We will
lose it in the next patch.
builtin/config.c | 39 +++++++++++++++++++++++++--------------
1 file changed, 25 insertions(+), 14 deletions(-)
diff --git a/builtin/config.c b/builtin/config.c
index 98d65bc0ad..e675ae0640 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -280,6 +280,28 @@ static int collect_config(const char *key_, const char *value_, void *cb)
return format_config(&values->items[values->nr++], key_, value_);
}
+static int handle_value_regex(const char *regex_)
+{
+ if (!regex_) {
+ regexp = NULL;
+ return 0;
+ }
+
+ if (regex_[0] == '!') {
+ do_not_match = 1;
+ regex_++;
+ }
+
+ regexp = (regex_t*)xmalloc(sizeof(regex_t));
+ if (regcomp(regexp, regex_, REG_EXTENDED)) {
+ error(_("invalid pattern: %s"), regex_);
+ FREE_AND_NULL(regexp);
+ return CONFIG_INVALID_PATTERN;
+ }
+
+ return 0;
+}
+
static int get_value(const char *key_, const char *regex_)
{
int ret = CONFIG_GENERIC_ERROR;
@@ -317,20 +339,9 @@ static int get_value(const char *key_, const char *regex_)
}
}
- if (regex_) {
- if (regex_[0] == '!') {
- do_not_match = 1;
- regex_++;
- }
-
- regexp = (regex_t*)xmalloc(sizeof(regex_t));
- if (regcomp(regexp, regex_, REG_EXTENDED)) {
- error(_("invalid pattern: %s"), regex_);
- FREE_AND_NULL(regexp);
- ret = CONFIG_INVALID_PATTERN;
- goto free_strings;
- }
- }
+ ret = handle_value_regex(regex_);
+ if (ret)
+ goto free_strings;
config_with_options(collect_config, &values,
&given_config_source, &config_options);
--
2.24.0
next prev parent reply other threads:[~2019-11-13 18:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-13 18:54 [PATCH 0/8] builtin/config: canonicalize "value_regex" with `--type=bool[-or-int]` Martin Ågren
2019-11-13 18:55 ` [PATCH 1/8] config: make `git_parse_maybe_bool_text()` public Martin Ågren
2019-11-13 18:55 ` [PATCH 2/8] t1300: modernize part of script Martin Ågren
2019-11-21 4:54 ` Junio C Hamano
2019-11-13 18:55 ` Martin Ågren [this message]
2019-11-21 5:02 ` [PATCH 3/8] builtin/config: extract `handle_value_regex()` from `get_value()` Junio C Hamano
2019-11-21 19:53 ` Martin Ågren
2019-11-13 18:55 ` [PATCH 4/8] builtin/config: collect "value_regexp" data in a struct Martin Ågren
2019-11-21 5:22 ` Junio C Hamano
2019-11-21 19:55 ` Martin Ågren
2019-11-22 6:30 ` Junio C Hamano
2019-11-13 18:55 ` [PATCH 5/8] builtin/config: canonicalize "value_regex" with `--type=bool` Martin Ågren
2019-11-21 5:37 ` Junio C Hamano
2019-11-13 18:55 ` [PATCH 6/8] builtin/config: canonicalize "value_regex" with `--type=bool-or-int` Martin Ågren
2019-11-13 18:55 ` [PATCH 7/8] builtin/config: warn if "value_regex" doesn't canonicalize as boolean Martin Ågren
2019-11-21 5:43 ` Junio C Hamano
2019-11-21 19:58 ` Martin Ågren
2019-11-13 18:55 ` [PATCH 8/8] builtin/config: die " Martin Ågren
2019-11-14 2:18 ` [PATCH 0/8] builtin/config: canonicalize "value_regex" with `--type=bool[-or-int]` Junio C Hamano
2019-11-14 6:40 ` Martin Ågren
2019-11-14 6:29 ` Jeff King
2019-11-14 6:54 ` Martin Ågren
2019-11-14 7:37 ` Jeff King
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=c4bcb32299291549d82c0544937a647c5000ad64.1573670565.git.martin.agren@gmail.com \
--to=martin.agren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).