summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@elego.de>2011-04-07 11:24:16 +0200
committerCarlos Martín Nieto <cmn@elego.de>2011-04-07 17:15:38 +0200
commit493384e39c1ddfcc4badf962706e02302577d89f (patch)
treeed870edfccb92e3dbba6d8285261922b3886e4e0
parent6b45cb8a89cd3b133183a093719a144a402450e9 (diff)
downloadlibgit2-493384e39c1ddfcc4badf962706e02302577d89f.tar.gz
config: make cvar_free behave more like other free functions
Make cvar_free return void instad of the next element, as it was mostly a hack to make cvar_list_free shorter but it's now using the list macros. Also check if the input is NULL and return immediately in that case. Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
-rw-r--r--src/config.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/config.c b/src/config.c
index d537fd8a5..5f0bcd880 100644
--- a/src/config.c
+++ b/src/config.c
@@ -37,15 +37,14 @@ static int config_parse(git_config *cfg_file);
static int parse_variable(git_config *cfg, char **var_name, char **var_value);
void git_config_free(git_config *cfg);
-static git_cvar *cvar_free(git_cvar *var)
+static void cvar_free(git_cvar *var)
{
- git_cvar *next = var->next;
+ if (var == NULL)
+ return;
free(var->name);
free(var->value);
free(var);
-
- return next;
}
static void cvar_list_free(git_cvar_list *list)