builtin/config: convert `value_pattern` to a local variable
The `value_pattern` variable is used by the `format_config()` callback when `CONFIG_FLAGS_FIXED_VALUE` is used. 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
bfe45f83e7a7815cbaea04f380cd807c18c088ea
1 file changed
+3
-3
builtin/config.c
+3
-3
@@ -125,7 +125,6 @@ struct config_display_options {
125
126
static char *key;
127
static regex_t *key_regexp;
128
-static const char *value_pattern;
128
static regex_t *regexp;
129
static int use_key_regexp;
130
static int do_all;
@@ -327,6 +326,7 @@ static int format_config(const struct config_display_options *opts,
326
struct collect_config_data {
327
const struct config_display_options *display_opts;
328
struct strbuf_list *values;
329
+ const char *value_pattern;
330
int do_not_match;
331
};
332
@@ -341,7 +341,7 @@ static int collect_config(const char *key_, const char *value_,
341
return 0;
342
if (use_key_regexp && regexec(key_regexp, key_, 0, NULL, 0))
343
return 0;
344
- if (fixed_value && strcmp(value_pattern, (value_?value_:"")))
344
+ if (fixed_value && strcmp(data->value_pattern, (value_?value_:"")))
345
return 0;
346
if (regexp != NULL &&
347
(data->do_not_match ^ !!regexec(regexp, (value_?value_:""), 0, NULL, 0)))
@@ -398,7 +398,7 @@ static int get_value(const struct config_location_options *opts,
398
}
399
400
if (regex_ && (flags & CONFIG_FLAGS_FIXED_VALUE))
401
- value_pattern = regex_;
401
+ data.value_pattern = regex_;
402
else if (regex_) {
403
if (regex_[0] == '!') {
404
data.do_not_match = 1;