aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-09-12 20:23:48 -0700
committerJunio C Hamano <gitster@pobox.com>2016-09-13 15:45:45 -0700
commitc0c08897c47eb46179c8d2408dc1a91713307842 (patch)
treecd5aeab18a5d620703e97f27dc994efdd9ea2078
parent4babb839aaa18b14a5ec9e8994678d75bc120920 (diff)
downloadgit-c0c08897c47eb46179c8d2408dc1a91713307842.tar.gz
git-c0c08897c47eb46179c8d2408dc1a91713307842.tar.xz
pager: make pager_program a file-local static
This variable is only ever used by the routines in pager.c, and other parts of the code should always use those routines (like git_pager()) to make decisions about which pager to use. Let's reduce its scope to prevent accidents. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--cache.h1
-rw-r--r--environment.c1
-rw-r--r--pager.c1
3 files changed, 1 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index 4ff196c25..5e50887d6 100644
--- a/cache.h
+++ b/cache.h
@@ -1733,7 +1733,6 @@ extern int write_file_gently(const char *path, const char *fmt, ...);
/* pager.c */
extern void setup_pager(void);
-extern const char *pager_program;
extern int pager_in_use(void);
extern int pager_use_color;
extern int term_columns(void);
diff --git a/environment.c b/environment.c
index 96160a75a..bccdee9d0 100644
--- a/environment.c
+++ b/environment.c
@@ -39,7 +39,6 @@ size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;
size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;
size_t delta_base_cache_limit = 96 * 1024 * 1024;
unsigned long big_file_threshold = 512 * 1024 * 1024;
-const char *pager_program;
int pager_use_color = 1;
const char *editor_program;
const char *askpass_program;
diff --git a/pager.c b/pager.c
index fc210f951..00c8baace 100644
--- a/pager.c
+++ b/pager.c
@@ -7,6 +7,7 @@
#endif
static struct child_process pager_process = CHILD_PROCESS_INIT;
+static const char *pager_program;
static void wait_for_pager(int in_signal)
{