From 3d1806487af395fb33d1de92633e96571b296305 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Mon, 22 Feb 2016 12:23:36 +0100 Subject: config: rename git_config_set_or_die to git_config_set Rename git_config_set_or_die functions to git_config_set, leading to the new default behavior of dying whenever a configuration error occurs. By now all callers that shall die on error have been transitioned to the _or_die variants, thus making this patch a simple rename of the functions. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- config.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'config.c') diff --git a/config.c b/config.c index e7f42da18b..325c3eaf9d 100644 --- a/config.c +++ b/config.c @@ -1831,10 +1831,10 @@ int git_config_set_in_file_gently(const char *config_filename, return git_config_set_multivar_in_file_gently(config_filename, key, value, NULL, 0); } -void git_config_set_in_file_or_die(const char *config_filename, - const char *key, const char *value) +void git_config_set_in_file(const char *config_filename, + const char *key, const char *value) { - git_config_set_multivar_in_file_or_die(config_filename, key, value, NULL, 0); + git_config_set_multivar_in_file(config_filename, key, value, NULL, 0); } int git_config_set_gently(const char *key, const char *value) @@ -1842,9 +1842,9 @@ int git_config_set_gently(const char *key, const char *value) return git_config_set_multivar_gently(key, value, NULL, 0); } -void git_config_set_or_die(const char *key, const char *value) +void git_config_set(const char *key, const char *value) { - git_config_set_multivar_or_die(key, value, NULL, 0); + git_config_set_multivar(key, value, NULL, 0); } /* @@ -2191,9 +2191,9 @@ write_err_out: } -void git_config_set_multivar_in_file_or_die(const char *config_filename, - const char *key, const char *value, - const char *value_regex, int multi_replace) +void git_config_set_multivar_in_file(const char *config_filename, + const char *key, const char *value, + const char *value_regex, int multi_replace) { if (git_config_set_multivar_in_file_gently(config_filename, key, value, value_regex, multi_replace) < 0) @@ -2207,11 +2207,11 @@ int git_config_set_multivar_gently(const char *key, const char *value, multi_replace); } -void git_config_set_multivar_or_die(const char *key, const char *value, - const char *value_regex, int multi_replace) +void git_config_set_multivar(const char *key, const char *value, + const char *value_regex, int multi_replace) { - git_config_set_multivar_in_file_or_die(NULL, key, value, value_regex, - multi_replace); + git_config_set_multivar_in_file(NULL, key, value, value_regex, + multi_replace); } static int section_name_match (const char *buf, const char *name) -- cgit v1.2.1