summaryrefslogtreecommitdiff
path: root/builtin/merge.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 /builtin/merge.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 'builtin/merge.c')
-rw-r--r--builtin/merge.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index ce82eb2..9da9e30 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -237,11 +237,10 @@ static void drop_save(void)
static int save_state(unsigned char *stash)
{
int len;
- struct child_process cp;
+ struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf buffer = STRBUF_INIT;
const char *argv[] = {"stash", "create", NULL};
- memset(&cp, 0, sizeof(cp));
cp.argv = argv;
cp.out = -1;
cp.git_cmd = 1;