Use __VA_ARGS__ for all of error's arguments

[git.git] / config.c

diff --git a/config.c b/config.c
index fff8a43bc0378d7d7ee6d7ab3deee228c87b1d5c..526f6823740bc266a15ea7488b4c834a36f58029 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1279,6 +1279,7 @@ int git_config_parse_key(const char *key, char **store_key, int *baselen_)
 
 out_free_ret_1:
        free(*store_key);
+       *store_key = NULL;
        return -CONFIG_INVALID_KEY;
 }
 
@@ -1659,6 +1660,7 @@ int git_config_rename_section(const char *old_name, const char *new_name)
  * Call this to report error for your variable that should not
  * get a boolean value (i.e. "[my] var" means "true").
  */
+#undef config_error_nonbool
 int config_error_nonbool(const char *var)
 {
        return error("Missing value for '%s'", var);