Merge branch 'rs/run-command-use-alloc-array'

gitster · gitster · commit d5d5295e0ad3 · 2017-10-05T13:48:20.000+09:00
Code clean-up.

* rs/run-command-use-alloc-array:
  run-command: use ALLOC_ARRAY
diff --git a/run-command.c b/run-command.c
@@ -452,7 +452,7 @@ static char **prep_childenv(const char *const *deltaenv)
 	}
 
 	/* Create an array of 'char *' to be used as the childenv */
-	childenv = xmalloc((env.nr + 1) * sizeof(char *));
+	ALLOC_ARRAY(childenv, env.nr + 1);
 	for (i = 0; i < env.nr; i++)
 		childenv[i] = env.items[i].util;
 	childenv[env.nr] = NULL;

Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ static char *prep_childenv(const char const *deltaenv)`
`452`	`452`	`}`
`453`	`453`
`454`	`454`	`/* Create an array of 'char ' to be used as the childenv /`
`455`		`- childenv = xmalloc((env.nr + 1) * sizeof(char *));`
	`455`	`+ ALLOC_ARRAY(childenv, env.nr + 1);`
`456`	`456`	`for (i = 0; i < env.nr; i++)`
`457`	`457`	`childenv[i] = env.items[i].util;`
`458`	`458`	`childenv[env.nr] = NULL;`