Add "const" qualifier to "char *editor_program".

Also use "git_config_string" to simplify "config.c" code
where "editor_program" is set.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index 1ecaef14c329d8fed38734a73f0e89607b8ab7a3..ce7b386a4df346b91fcd00df3250587ff85711b8 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -614,7 +614,7 @@ extern const char *pager_program;
 extern int pager_in_use(void);
 extern int pager_use_color;
 
 extern int pager_in_use(void);
 extern int pager_use_color;
 

-extern char *editor_program;
+extern const char *editor_program;

 extern char *excludes_file;
 
 /* base85 */
 extern char *excludes_file;
 
 /* base85 */

diff --git a/config.c b/config.c
index eb6d2ad78b9235de1d8aa9e1a5b80ba7a3ba432c..703c2085a5d7745c06633e534e445926dfdc3185 100644 (file)
--- a/config.c
+++ b/config.c
@@ -443,12 +443,8 @@ int git_default_config(const char *var, const char *value)
        if (!strcmp(var, "core.pager"))
                return git_config_string(&pager_program, var, value);
 
        if (!strcmp(var, "core.pager"))
                return git_config_string(&pager_program, var, value);
 

-       if (!strcmp(var, "core.editor")) {
-               if (!value)
-                       return config_error_nonbool(var);
-               editor_program = xstrdup(value);
-               return 0;
-       }
+       if (!strcmp(var, "core.editor"))
+               return git_config_string(&editor_program, var, value);

 
        if (!strcmp(var, "core.excludesfile")) {
                if (!value)
 
        if (!strcmp(var, "core.excludesfile")) {
                if (!value)

diff --git a/environment.c b/environment.c
index b8869e972ea7c3cc668767e5b47750254c9653b7..9556009324c5945d4212be9155076f7f8b8adfbe 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -32,7 +32,7 @@ size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;
 size_t delta_base_cache_limit = 16 * 1024 * 1024;
 const char *pager_program;
 int pager_use_color = 1;
 size_t delta_base_cache_limit = 16 * 1024 * 1024;
 const char *pager_program;
 int pager_use_color = 1;

-char *editor_program;
+const char *editor_program;

 char *excludes_file;
 int auto_crlf = 0;     /* 1: both ways, -1: only when adding git objects */
 unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
 char *excludes_file;
 int auto_crlf = 0;     /* 1: both ways, -1: only when adding git objects */
 unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;