[PATCH 2/6] git_config_parse_parameter: refactor cleanup code
- From
Jeff King <peff@peff.net>
- Date
- May 18, 2016, 22:39 UTC
- Message-ID
- <20160518223949.GB22443@sigill.intra.peff.net>
- In-Reply-To
- <20160518223712.GA18317@sigill.intra.peff.net>
We have several exits from the function, each of which has to do some cleanup. Let's consolidate these in an "out" label we can jump to. This doesn't save us much now, but it will help as we add more things that need cleanup.
Signed-off-by: Jeff King <peff@peff.net> --- config.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/config.c b/config.c index 3f8f6aa..eb1e268 100644 --- a/config.c +++ b/config.c @@ -205,6 +205,7 @@ int git_config_parse_parameter(const char *text, int git_config_from_parameters(config_fn_t fn, void *data) { const char *env = getenv(CONFIG_DATA_ENVIRONMENT); + int ret = 0; char *envw; const char **argv = NULL; int nr = 0, alloc = 0; @@ -216,21 +217,21 @@ int git_config_from_parameters(config_fn_t fn, void *data) envw = xstrdup(env); if (sq_dequote_to_argv(envw, &argv, &nr, &alloc) < 0) { - free(envw); - return error("bogus format in " CONFIG_DATA_ENVIRONMENT); + ret = error("bogus format in " CONFIG_DATA_ENVIRONMENT); + goto out; } for (i = 0; i < nr; i++) { if (git_config_parse_parameter(argv[i], fn, data) < 0) { - free(argv); - free(envw); - return -1; + ret = -1; + goto out; } } +out: free(argv); free(envw); - return 0; + return ret; } static int get_next_char(void)
-- 2.8.2.888.gecb1fe3