[PATCH/RFC 1/5] config.c : move configset_iter() to an appropriate position
From: Tanay Abhra <hidden>
Date: 2016-06-15 23:02:38
Subsystem:
the rest · Maintainer:
Linus Torvalds
Move configset_iter() to an appropriate position where it can be called by git_config_*() family without putting a forward declaration for it. Helped-by: Matthieu Moy [off-list ref] Signed-off-by: Tanay Abhra <redacted> --- config.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/config.c b/config.c
index a677eb6..cb474b2 100644
--- a/config.c
+++ b/config.c@@ -1150,6 +1150,25 @@ int git_config_system(void) return !git_env_bool("GIT_CONFIG_NOSYSTEM", 0); } +static void configset_iter(struct config_set *cs, config_fn_t fn, void *data) +{ + int i, value_index; + struct string_list *values; + struct config_set_element *entry; + struct configset_list *list = &cs->list; + struct key_value_info *kv_info; + + for (i = 0; i < list->nr; i++) { + entry = list->items[i].e; + value_index = list->items[i].value_index; + values = &entry->value_list; + if (fn(entry->key, values->items[value_index].string, data) < 0) { + kv_info = values->items[value_index].util; + git_die_config_linenr(entry->key, kv_info->filename, kv_info->linenr); + } + } +} + int git_config_early(config_fn_t fn, void *data, const char *repo_config) { int ret = 0, found = 0;
@@ -1245,25 +1264,6 @@ static void git_config_raw(config_fn_t fn, void *data) die(_("unknown error occured while reading the configuration files")); } -static void configset_iter(struct config_set *cs, config_fn_t fn, void *data) -{ - int i, value_index; - struct string_list *values; - struct config_set_element *entry; - struct configset_list *list = &cs->list; - struct key_value_info *kv_info; - - for (i = 0; i < list->nr; i++) { - entry = list->items[i].e; - value_index = list->items[i].value_index; - values = &entry->value_list; - if (fn(entry->key, values->items[value_index].string, data) < 0) { - kv_info = values->items[value_index].util; - git_die_config_linenr(entry->key, kv_info->filename, kv_info->linenr); - } - } -} - static void git_config_check_init(void); void git_config(config_fn_t fn, void *data)
--
1.9.0.GIT