builtin/config: convert `do_not_match` to a local variable
The `do_not_match` variable is used by the `format_config()` callback as an indicator whether or not the passed regular expression is negated. It is only ever set up by its only caller, `collect_config()` and can thus easily be moved into the `collect_config_data` structure. Do so to remove our reliance on global state. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
May 15, 2024 at 08:42 UTC
65d197cffc7ad52c61398c2579efa988779cc7ab
1 file changed
+3
-3
builtin/config.c
+3
-3
@@ -129,7 +129,6 @@ static const char *value_pattern;
129
static regex_t *regexp;
130
static int use_key_regexp;
131
static int do_all;
132
-static int do_not_match;
132
static int fixed_value;
133
134
#define TYPE_BOOL 1
@@ -328,6 +327,7 @@ static int format_config(const struct config_display_options *opts,
327
struct collect_config_data {
328
const struct config_display_options *display_opts;
329
struct strbuf_list *values;
330
+ int do_not_match;
331
};
332
333
static int collect_config(const char *key_, const char *value_,
@@ -344,7 +344,7 @@ static int collect_config(const char *key_, const char *value_,
344
if (fixed_value && strcmp(value_pattern, (value_?value_:"")))
345
return 0;
346
if (regexp != NULL &&
347
- (do_not_match ^ !!regexec(regexp, (value_?value_:""), 0, NULL, 0)))
347
+ (data->do_not_match ^ !!regexec(regexp, (value_?value_:""), 0, NULL, 0)))
348
return 0;
349
350
ALLOC_GROW(values->items, values->nr + 1, values->alloc);
@@ -401,7 +401,7 @@ static int get_value(const struct config_location_options *opts,
401
value_pattern = regex_;
402
else if (regex_) {
403
if (regex_[0] == '!') {
404
- do_not_match = 1;
404
+ data.do_not_match = 1;
405
regex_++;
406
}
407