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>
Christian Couder committed
Feb 16, 2008 at 06:01 UTC
ee9601e6bef2281e3183e127e1e4e36ed257af7a
3 files changed
+4
-8
cache.h
+1
-1
@@ -614,7 +614,7 @@ extern const char *pager_program;
614
extern int pager_in_use(void);
615
extern int pager_use_color;
616
617
-extern char *editor_program;
617
+extern const char *editor_program;
618
extern char *excludes_file;
619
620
/* base85 */
config.c
+2
-6
@@ -443,12 +443,8 @@ int git_default_config(const char *var, const char *value)
443
if (!strcmp(var, "core.pager"))
444
return git_config_string(&pager_program, var, value);
445
446
- if (!strcmp(var, "core.editor")) {
447
- if (!value)
448
- return config_error_nonbool(var);
449
- editor_program = xstrdup(value);
450
- return 0;
451
- }
446
+ if (!strcmp(var, "core.editor"))
447
+ return git_config_string(&editor_program, var, value);
448
449
if (!strcmp(var, "core.excludesfile")) {
450
if (!value)
environment.c
+1
-1
@@ -32,7 +32,7 @@ size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;
32
size_t delta_base_cache_limit = 16 * 1024 * 1024;
33
const char *pager_program;
34
int pager_use_color = 1;
35
-char *editor_program;
35
+const char *editor_program;
36
char *excludes_file;
37
int auto_crlf = 0; /* 1: both ways, -1: only when adding git objects */
38
unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;