From: René Scharfe <l.s.r@web.de>
Date: Sun, 9 Nov 2014 13:49:58 +0000 (+0100)
Subject: trailer: use CHILD_PROCESS_INIT in apply_command()
X-Git-Tag: v2.2.0-rc2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b226293b44750f4e2ebd121e6f85528170f8e2c5;p=thirdparty%2Fgit.git

trailer: use CHILD_PROCESS_INIT in apply_command()

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>
---

diff --git a/trailer.c b/trailer.c
index 7ff036cb84..6ae786505a 100644
--- 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;