diff options
author | Christian Couder <chriscool@tuxfamily.org> | 2008-02-16 08:01:41 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-16 08:24:53 +0300 |
commit | ee9601e6bef2281e3183e127e1e4e36ed257af7a (patch) | |
tree | 3947e274d394f2f6b48e159de8e07c0cd9b3db4d | |
parent | 872da32d80c004c26a19a5d6cb31eb3e7f034094 (diff) |
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>
-rw-r--r-- | cache.h | 2 | ||||
-rw-r--r-- | config.c | 8 | ||||
-rw-r--r-- | environment.c | 2 |
3 files changed, 4 insertions, 8 deletions
@@ -614,7 +614,7 @@ extern const char *pager_program; 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 */ @@ -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.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) diff --git a/environment.c b/environment.c index b8869e972e..9556009324 100644 --- 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; -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; |