{"thread":{"id":"12130","subject":"[PATCH 4/6] Add \"const\" qualifier to \"char *editor_program\".","startedAt":"2008-02-16T05:01:41Z","lastAt":"2008-02-16T05:01:41Z","messageCount":1,"participants":["Christian Couder"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"68869","messageId":"20080216060141.53c0634b.chriscool@tuxfamily.org","threadId":"12130","inReplyTo":null,"subject":"[PATCH 4/6] Add \"const\" qualifier to \"char *editor_program\".","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2008-02-16T05:01:41Z","receivedAt":"2008-02-16T05:01:41Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Also use \"git_config_string\" to simplify \"config.c\" code\nwhere \"editor_program\" is set.\n\nSigned-off-by: Christian Couder <chriscool@tuxfamily.org>\n---\n cache.h       |    2 +-\n config.c      |    8 ++------\n environment.c |    2 +-\n 3 files changed, 4 insertions(+), 8 deletions(-)\n\ndiff --git a/cache.h b/cache.h\nindex 892f374..2af1468 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -655,7 +655,7 @@ extern const char *pager_program;\n extern int pager_in_use(void);\n extern int pager_use_color;\n \n-extern char *editor_program;\n+extern const char *editor_program;\n extern char *excludes_file;\n \n /* base85 */\ndiff --git a/config.c b/config.c\nindex 01e3843..07027de 100644\n--- a/config.c\n+++ b/config.c\n@@ -443,12 +443,8 @@ int git_default_config(const char *var, const char *value)\n \tif (!strcmp(var, \"core.pager\"))\n \t\treturn git_config_string(&pager_program, var, value);\n \n-\tif (!strcmp(var, \"core.editor\")) {\n-\t\tif (!value)\n-\t\t\treturn config_error_nonbool(var);\n-\t\teditor_program = xstrdup(value);\n-\t\treturn 0;\n-\t}\n+\tif (!strcmp(var, \"core.editor\"))\n+\t\treturn git_config_string(&editor_program, var, value);\n \n \tif (!strcmp(var, \"core.excludesfile\")) {\n \t\tif (!value)\ndiff --git a/environment.c b/environment.c\nindex b8869e9..9556009 100644\n--- a/environment.c\n+++ b/environment.c\n@@ -32,7 +32,7 @@ size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;\n size_t delta_base_cache_limit = 16 * 1024 * 1024;\n const char *pager_program;\n int pager_use_color = 1;\n-char *editor_program;\n+const char *editor_program;\n char *excludes_file;\n int auto_crlf = 0;\t/* 1: both ways, -1: only when adding git objects */\n unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;\n-- \n1.5.4.1.129.gf12af-dirty\n"}]}