trailer: use CHILD_PROCESS_INIT in apply_command()
authorRené Scharfe <l.s.r@web.de>
Sun, 9 Nov 2014 13:49:58 +0000 (14:49 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Nov 2014 18:03:39 +0000 (10:03 -0800)
Initialize the struct child_process variable cp at declaration time.
This is shorter, saves a function call and prevents using the variable
before initialization by mistake.

Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
trailer.c
index 7ff036cb84d47169c5e4b7dc29619a1efbb12ce2..6ae786505ae782809cbc0fa3599c88c7783782d5 100644 (file)
--- a/trailer.c
+++ b/trailer.c
@@ -228,7 +228,7 @@ static const char *apply_command(const char *command, const char *arg)
 {
        struct strbuf cmd = STRBUF_INIT;
        struct strbuf buf = STRBUF_INIT;
-       struct child_process cp;
+       struct child_process cp = CHILD_PROCESS_INIT;
        const char *argv[] = {NULL, NULL};
        const char *result;
 
@@ -237,7 +237,6 @@ static const char *apply_command(const char *command, const char *arg)
                strbuf_replace(&cmd, TRAILER_ARG_STRING, arg);
 
        argv[0] = cmd.buf;
-       child_process_init(&cp);
        cp.argv = argv;
        cp.env = local_repo_env;
        cp.no_stdin = 1;