development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-01 14:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

git_config_parse_parameter: refactor cleanup code

Browse source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2016-05-18 18:39:49 -04:00 committed by Junio C Hamano
parent c72ee44bf4
commit a77d6db69b
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
config.c
View file

@ -205,6 +205,7 @@ int git_config_parse_parameter(const char *text,
int git_config_from_parameters(config_fn_t fn, void *data) int git_config_from_parameters(config_fn_t fn, void *data)
{ {
const char *env = getenv(CONFIG_DATA_ENVIRONMENT); const char *env = getenv(CONFIG_DATA_ENVIRONMENT);
int ret = 0;
char *envw; char *envw;
const char **argv = NULL; const char **argv = NULL;
int nr = 0, alloc = 0; int nr = 0, alloc = 0;
@ -216,21 +217,21 @@ int git_config_from_parameters(config_fn_t fn, void *data)
envw = xstrdup(env); envw = xstrdup(env);
if (sq_dequote_to_argv(envw, &argv, &nr, &alloc) < 0) { if (sq_dequote_to_argv(envw, &argv, &nr, &alloc) < 0) {
free(envw); ret = error("bogus format in " CONFIG_DATA_ENVIRONMENT);
return error("bogus format in " CONFIG_DATA_ENVIRONMENT); goto out;
} }
for (i = 0; i < nr; i++) { for (i = 0; i < nr; i++) {
if (git_config_parse_parameter(argv[i], fn, data) < 0) { if (git_config_parse_parameter(argv[i], fn, data) < 0) {
free(argv); ret = -1;
free(envw); goto out;
return -1;
} }
} }
out:
free(argv); free(argv);
free(envw); free(envw);
return 0; return ret;
} }
static int get_next_char(void) static int get_next_char(void)