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

Also use "git_config_string" to simplify "config.c" code where "pager_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 872da32d80c004c26a19a5d6cb31eb3e7f034094

3 files changed +4 -8

cache.h

+1 -1

@@ -610,7 +610,7 @@ extern int write_or_whine_pipe(int fd, const void *buf, size_t count, const char

610

611 /* pager.c */

612 extern void setup_pager(void);

613 -extern char *pager_program;

613 +extern const char *pager_program;

614 extern int pager_in_use(void);

615 extern int pager_use_color;

616

config.c

+2 -6

@@ -440,12 +440,8 @@ int git_default_config(const char *var, const char *value)

440 return 0;

441 }

442

443 - if (!strcmp(var, "core.pager")) {

444 - if (!value)

445 - return config_error_nonbool(var);

446 - pager_program = xstrdup(value);

447 - return 0;

448 - }

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)

environment.c

+1 -1

@@ -30,7 +30,7 @@ int core_compression_seen;

30 size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;

31 size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;

32 size_t delta_base_cache_limit = 16 * 1024 * 1024;

33 -char *pager_program;

33 +const char *pager_program;

34 int pager_use_color = 1;

35 char *editor_program;

36 char *excludes_file;