Commit ec9edd56 by Jakob Pfender Committed by Vicent Marti

config_file.c: Move to new error handling mechanism

parent a6d647d2
...@@ -263,7 +263,7 @@ static int config_open(git_config_file *cfg) ...@@ -263,7 +263,7 @@ static int config_open(git_config_file *cfg)
gitfo_free_buf(&b->reader.buffer); gitfo_free_buf(&b->reader.buffer);
free(cfg); free(cfg);
return error; return git__rethrow(error, "Failed to open config");
} }
static void backend_free(git_config_file *_backend) static void backend_free(git_config_file *_backend)
...@@ -363,7 +363,7 @@ static int config_set(git_config_file *cfg, const char *name, const char *value) ...@@ -363,7 +363,7 @@ static int config_set(git_config_file *cfg, const char *name, const char *value)
if (error < GIT_SUCCESS) if (error < GIT_SUCCESS)
cvar_free(var); cvar_free(var);
return error; return error == GIT_SUCCESS ? GIT_SUCCESS : git__rethrow(error, "Failed to set config value");
} }
/* /*
...@@ -382,7 +382,7 @@ static int config_get(git_config_file *cfg, const char *name, const char **out) ...@@ -382,7 +382,7 @@ static int config_get(git_config_file *cfg, const char *name, const char **out)
*out = var->value; *out = var->value;
return error; return error == GIT_SUCCESS ? GIT_SUCCESS : git__rethrow(error, "Failed to get config value for %s", name);
} }
int git_config_file__ondisk(git_config_file **out, const char *path) int git_config_file__ondisk(git_config_file **out, const char *path)
...@@ -711,7 +711,7 @@ static int parse_section_header(diskfile_backend *cfg, char **section_out) ...@@ -711,7 +711,7 @@ static int parse_section_header(diskfile_backend *cfg, char **section_out)
error = parse_section_header_ext(line, name, section_out); error = parse_section_header_ext(line, name, section_out);
free(line); free(line);
free(name); free(name);
return error; return error == GIT_SUCCESS ? GIT_SUCCESS : git__rethrow(error, "Failed to parse header");
} }
if (!config_keychar(c) && c != '.') { if (!config_keychar(c) && c != '.') {
...@@ -874,7 +874,7 @@ static int config_parse(diskfile_backend *cfg_file) ...@@ -874,7 +874,7 @@ static int config_parse(diskfile_backend *cfg_file)
if (current_section) if (current_section)
free(current_section); free(current_section);
return error; return error == GIT_SUCCESS ? GIT_SUCCESS : git__rethrow(error, "Failed to parse config");
} }
static int is_multiline_var(const char *str) static int is_multiline_var(const char *str)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment