From 43b019022478703758b3744fa242867ed620a9a6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 16 Feb 2016 14:26:40 -0800 Subject: pager: lose a separate argv[] These days, using the embedded args array in the child_process structure is the norm. Follow that practice. Signed-off-by: Junio C Hamano --- pager.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pager.c') diff --git a/pager.c b/pager.c index 070dc11cb0..5dbcc5ace3 100644 --- a/pager.c +++ b/pager.c @@ -11,7 +11,6 @@ * something different on Windows. */ -static const char *pager_argv[] = { NULL, NULL }; static struct child_process pager_process = CHILD_PROCESS_INIT; static void wait_for_pager(void) @@ -70,9 +69,8 @@ void setup_pager(void) setenv("GIT_PAGER_IN_USE", "true", 1); /* spawn the pager */ - pager_argv[0] = pager; + argv_array_push(&pager_process.args, pager); pager_process.use_shell = 1; - pager_process.argv = pager_argv; pager_process.in = -1; if (!getenv("LESS")) argv_array_push(&pager_process.env_array, "LESS=FRX"); -- cgit v1.2.3