development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-05 00:58:49 +00:00
Code Issues Projects Releases Wiki Activity

builtin/config: convert value_pattern to a local variable

Browse Source 
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>
This commit is contained in:
Patrick Steinhardt 2024-05-15 08:42:44 +02:00 committed by Junio C Hamano
parent 65d197cffc
commit bfe45f83e7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/config.c
View File

@ -125,7 +125,6 @@ struct config_display_options {
static char *key;
static regex_t *key_regexp;
static const char *value_pattern;
static regex_t *regexp;
static int use_key_regexp;
static int do_all;
@ -327,6 +326,7 @@ static int format_config(const struct config_display_options *opts,
struct collect_config_data {
const struct config_display_options *display_opts;
struct strbuf_list *values;
const char *value_pattern;
int do_not_match;
};
@ -341,7 +341,7 @@ static int collect_config(const char *key_, const char *value_,
return 0;
if (use_key_regexp && regexec(key_regexp, key_, 0, NULL, 0))
return 0;
if (fixed_value && strcmp(value_pattern, (value_?value_:"")))
if (fixed_value && strcmp(data->value_pattern, (value_?value_:"")))
return 0;
if (regexp != NULL &&
(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,
}
if (regex_ && (flags & CONFIG_FLAGS_FIXED_VALUE))
value_pattern = regex_;
data.value_pattern = regex_;
else if (regex_) {
if (regex_[0] == '!') {
data.do_not_match = 1;