From 8828f2985f1967201c256fb01f92a91acfdb5001 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ren=C3=A9=20Scharfe?= Date: Tue, 28 Oct 2014 21:52:34 +0100 Subject: [PATCH] use child_process_init() to initialize struct child_process variables Call child_process_init() instead of zeroing the memory of variables of type struct child_process by hand before use because the former is both clearer and shorter. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- bundle.c | 2 +- column.c | 2 +- trailer.c | 2 +- transport-helper.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bundle.c b/bundle.c index fa67057e60..c846092e9c 100644 --- a/bundle.c +++ b/bundle.c @@ -381,7 +381,7 @@ int create_bundle(struct bundle_header *header, const char *path, write_or_die(bundle_fd, "\n", 1); /* write pack */ - memset(&rls, 0, sizeof(rls)); + child_process_init(&rls); argv_array_pushl(&rls.args, "pack-objects", "--all-progress-implied", "--stdout", "--thin", "--delta-base-offset", diff --git a/column.c b/column.c index 8082a944fd..786abe62b0 100644 --- a/column.c +++ b/column.c @@ -374,7 +374,7 @@ int run_column_filter(int colopts, const struct column_options *opts) if (fd_out != -1) return -1; - memset(&column_process, 0, sizeof(column_process)); + child_process_init(&column_process); argv = &column_process.args; argv_array_push(argv, "column"); diff --git a/trailer.c b/trailer.c index 8514566564..7ff036cb84 100644 --- a/trailer.c +++ b/trailer.c @@ -237,7 +237,7 @@ static const char *apply_command(const char *command, const char *arg) strbuf_replace(&cmd, TRAILER_ARG_STRING, arg); argv[0] = cmd.buf; - memset(&cp, 0, sizeof(cp)); + child_process_init(&cp); cp.argv = argv; cp.env = local_repo_env; cp.no_stdin = 1; diff --git a/transport-helper.c b/transport-helper.c index 6cd9dd1f9f..0224687a23 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -414,7 +414,7 @@ static int get_exporter(struct transport *transport, struct child_process *helper = get_helper(transport); int i; - memset(fastexport, 0, sizeof(*fastexport)); + child_process_init(fastexport); /* we need to duplicate helper->in because we want to use it after * fastexport is done with it. */ -- 2.11.4.GIT