summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-11-09 14:49:58 +0100
committerJunio C Hamano <gitster@pobox.com>2014-11-10 10:03:39 -0800
commitb226293b44750f4e2ebd121e6f85528170f8e2c5 (patch)
tree028888ebd3e17fd343d7d92ce20dd4c29036b313
parent66edfe9ddc29102fa39edd37f9aecccbaca6a013 (diff)
downloadgit-b226293b44750f4e2ebd121e6f85528170f8e2c5.tar.gz
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>
-rw-r--r--trailer.c3
1 files changed, 1 insertions, 2 deletions
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;