summaryrefslogtreecommitdiff
path: root/bundle.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-08-19 19:09:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-08-20 16:53:37 (GMT)
commitd3180279322c7450a47decf8833de47f444ca93f (patch)
tree6b15045aef08b51a0831ee75bb67fd0beddc0d0c /bundle.c
parent6c4ab27f2378ce67940b4496365043119d7ffff2 (diff)
downloadgit-d3180279322c7450a47decf8833de47f444ca93f.zip
git-d3180279322c7450a47decf8833de47f444ca93f.tar.gz
git-d3180279322c7450a47decf8833de47f444ca93f.tar.bz2
run-command: introduce CHILD_PROCESS_INIT
Most struct child_process variables are cleared using memset first after declaration. Provide a macro, CHILD_PROCESS_INIT, that can be used to initialize them statically instead. That's shorter, doesn't require a function call and is slightly more readable (especially given that we already have STRBUF_INIT, ARGV_ARRAY_INIT etc.). Helped-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bundle.c')
-rw-r--r--bundle.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/bundle.c b/bundle.c
index 71a21a6..d6b4df8 100644
--- a/bundle.c
+++ b/bundle.c
@@ -240,7 +240,7 @@ int create_bundle(struct bundle_header *header, const char *path,
int i, ref_count = 0;
struct strbuf buf = STRBUF_INIT;
struct rev_info revs;
- struct child_process rls;
+ struct child_process rls = CHILD_PROCESS_INIT;
FILE *rls_fout;
bundle_to_stdout = !strcmp(path, "-");
@@ -258,7 +258,6 @@ int create_bundle(struct bundle_header *header, const char *path,
init_revisions(&revs, NULL);
/* write prerequisites */
- memset(&rls, 0, sizeof(rls));
argv_array_pushl(&rls.args,
"rev-list", "--boundary", "--pretty=oneline",
NULL);
@@ -417,14 +416,13 @@ int unbundle(struct bundle_header *header, int bundle_fd, int flags)
{
const char *argv_index_pack[] = {"index-pack",
"--fix-thin", "--stdin", NULL, NULL};
- struct child_process ip;
+ struct child_process ip = CHILD_PROCESS_INIT;
if (flags & BUNDLE_VERBOSE)
argv_index_pack[3] = "-v";
if (verify_bundle(header, 0))
return -1;
- memset(&ip, 0, sizeof(ip));
ip.argv = argv_index_pack;
ip.in = bundle_fd;
ip.no_stdout = 1;