[PATCH 2/4] config: factor out config file stack management
From: Jeff King <hidden>
Date: 2016-06-15 22:52:52
Subsystem:
the rest · Maintainer:
Linus Torvalds
Because a config callback may start parsing a new file, the global context regarding the current config file is stored as a stack. Currently we only need to manage that stack from git_config_from_file. Let's factor it out to allow new sources of config data. Signed-off-by: Jeff King <redacted> --- config.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/config.c b/config.c
index a6966c1..b82f749 100644
--- a/config.c
+++ b/config.c@@ -826,6 +826,23 @@ int git_default_config(const char *var, const char *value, void *dummy) return 0; } +static void config_file_push(config_file *top, const char *name) +{ + top->prev = cf; + top->f = NULL; + top->name = name; + top->linenr = 1; + top->eof = 0; + strbuf_init(&top->value, 1024); + cf = top; +} + +static void config_file_pop(config_file *top) +{ + strbuf_release(&top->value); + cf = top->prev; +} + int git_config_from_file(config_fn_t fn, const char *filename, void *data) { int ret;
@@ -835,21 +852,12 @@ int git_config_from_file(config_fn_t fn, const char *filename, void *data) if (f) { config_file top; - /* push config-file parsing state stack */ - top.prev = cf; + config_file_push(&top, filename); top.f = f; - top.name = filename; - top.linenr = 1; - top.eof = 0; - strbuf_init(&top.value, 1024); - cf = ⊤ ret = git_parse_file(fn, data); - /* pop config-file parsing state stack */ - strbuf_release(&top.value); - cf = top.prev; - + config_file_pop(&top); fclose(f); } return ret;
--
1.7.9.rc2.293.gaae2