builtin/config: convert `regexp` to a local variable
The `regexp` variable is used by the `format_config()` callback when `CONFIG_FLAGS_FIXED_VALUE` is not set. 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
4ff8feb307432e20b2b79e7fc0fde3f2e282b5a6
1 file changed
+9
-9
builtin/config.c
+9
-9
@@ -125,7 +125,6 @@ struct config_display_options {
125
126
static char *key;
127
static regex_t *key_regexp;
128
-static regex_t *regexp;
128
static int use_key_regexp;
129
static int do_all;
130
static int fixed_value;
@@ -327,6 +326,7 @@ struct collect_config_data {
326
const struct config_display_options *display_opts;
327
struct strbuf_list *values;
328
const char *value_pattern;
329
+ regex_t *regexp;
330
int do_not_match;
331
};
332
@@ -343,8 +343,8 @@ static int collect_config(const char *key_, const char *value_,
343
return 0;
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)))
346
+ if (data->regexp &&
347
+ (data->do_not_match ^ !!regexec(data->regexp, (value_?value_:""), 0, NULL, 0)))
348
return 0;
349
350
ALLOC_GROW(values->items, values->nr + 1, values->alloc);
@@ -405,10 +405,10 @@ static int get_value(const struct config_location_options *opts,
405
regex_++;
406
}
407
408
- regexp = (regex_t*)xmalloc(sizeof(regex_t));
409
- if (regcomp(regexp, regex_, REG_EXTENDED)) {
408
+ data.regexp = (regex_t*)xmalloc(sizeof(regex_t));
409
+ if (regcomp(data.regexp, regex_, REG_EXTENDED)) {
410
error(_("invalid pattern: %s"), regex_);
411
- FREE_AND_NULL(regexp);
411
+ FREE_AND_NULL(data.regexp);
412
ret = CONFIG_INVALID_PATTERN;
413
goto free_strings;
414
}
@@ -448,9 +448,9 @@ free_strings:
448
regfree(key_regexp);
449
free(key_regexp);
450
}
451
- if (regexp) {
452
- regfree(regexp);
453
- free(regexp);
451
+ if (data.regexp) {
452
+ regfree(data.regexp);
453
+ free(data.regexp);
454
}
455
456
return ret;