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 <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/bundle.c b/bundle.c
index fa67057e60fe638825cc80e65cb1fa0be5b26ed9..c846092e9cf99e94dd6ef3e2731c06b7107ec273 100644 (file)
--- 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 */
        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",
        argv_array_pushl(&rls.args,
                         "pack-objects", "--all-progress-implied",
                         "--stdout", "--thin", "--delta-base-offset",

diff --git a/column.c b/column.c
index 8082a944fd6d07f69d323678380d635d9361b77c..786abe62b0bb0f27b51218f7698c60476d12c8e8 100644 (file)
--- 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;
 
        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");
        argv = &column_process.args;
 
        argv_array_push(argv, "column");

diff --git a/trailer.c b/trailer.c
index 85145665640d3569b5513c712335da4de21743d3..7ff036cb84d47169c5e4b7dc29619a1efbb12ce2 100644 (file)
--- 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;
                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;
        cp.argv = argv;
        cp.env = local_repo_env;
        cp.no_stdin = 1;

diff --git a/transport-helper.c b/transport-helper.c
index 6cd9dd1f9fe98e4c65156fba41172ba22d5be6de..0224687a2316798c57315093315eafae0da0b1aa 100644 (file)
--- 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;
 
        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. */
 
        /* we need to duplicate helper->in because we want to use it after
         * fastexport is done with it. */