{"thread":{"id":"12129","subject":"[PATCH 3/6] Add \"const\" qualifier to \"char *pager_program\".","startedAt":"2008-02-16T05:01:11Z","lastAt":"2008-02-16T05:01:11Z","messageCount":1,"participants":["Christian Couder"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"68868","messageId":"20080216060111.6ed7c673.chriscool@tuxfamily.org","threadId":"12129","inReplyTo":null,"subject":"[PATCH 3/6] Add \"const\" qualifier to \"char *pager_program\".","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2008-02-16T05:01:11Z","receivedAt":"2008-02-16T05:01:11Z","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 \"pager_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 cef058d..892f374 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -651,7 +651,7 @@ extern int write_or_whine_pipe(int fd, const void *buf, size_t count, const char\n \n /* pager.c */\n extern void setup_pager(void);\n-extern char *pager_program;\n+extern const char *pager_program;\n extern int pager_in_use(void);\n extern int pager_use_color;\n \ndiff --git a/config.c b/config.c\nindex ca6af2d..01e3843 100644\n--- a/config.c\n+++ b/config.c\n@@ -440,12 +440,8 @@ int git_default_config(const char *var, const char *value)\n \t\treturn 0;\n \t}\n \n-\tif (!strcmp(var, \"core.pager\")) {\n-\t\tif (!value)\n-\t\t\treturn config_error_nonbool(var);\n-\t\tpager_program = xstrdup(value);\n-\t\treturn 0;\n-\t}\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)\ndiff --git a/environment.c b/environment.c\nindex 18a1c4e..b8869e9 100644\n--- a/environment.c\n+++ b/environment.c\n@@ -30,7 +30,7 @@ int core_compression_seen;\n size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;\n size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;\n size_t delta_base_cache_limit = 16 * 1024 * 1024;\n-char *pager_program;\n+const char *pager_program;\n int pager_use_color = 1;\n char *editor_program;\n char *excludes_file;\n-- \n1.5.4.1.129.gf12af-dirty\n"}]}