diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:27 -0700 |
| commit | 825fd93767510895a98ad7f12e3c1af3e40e367b (patch) | |
| tree | ea3b4beac8dae69e2b45c9bfb8ce2cc21f462499 /builtin/help.c | |
| parent | 49feda62bddc188d8b2fa413437b5fc70e3de51f (diff) | |
| parent | 1f87293d78a4b2bd9265bac49b14a6f1111918b8 (diff) | |
| download | git-825fd93767510895a98ad7f12e3c1af3e40e367b.tar.gz | |
Merge branch 'rs/child-process-init'
Code clean-up.
* rs/child-process-init:
run-command: inline prepare_run_command_v_opt()
run-command: call run_command_v_opt_cd_env() instead of duplicating it
run-command: introduce child_process_init()
run-command: introduce CHILD_PROCESS_INIT
Diffstat (limited to 'builtin/help.c')
| -rw-r--r-- | builtin/help.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/help.c b/builtin/help.c index 1fdefeb686..8343b4027d 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -79,12 +79,11 @@ static const char *get_man_viewer_info(const char *name) static int check_emacsclient_version(void) { struct strbuf buffer = STRBUF_INIT; - struct child_process ec_process; + struct child_process ec_process = CHILD_PROCESS_INIT; const char *argv_ec[] = { "emacsclient", "--version", NULL }; int version; /* emacsclient prints its version number on stderr */ - memset(&ec_process, 0, sizeof(ec_process)); ec_process.argv = argv_ec; ec_process.err = -1; ec_process.stdout_to_stderr = 1; |