run-command: inline prepare_run_command_v_opt()
Merge prepare_run_command_v_opt() and its only caller. This removes a pointer indirection and allows to initialize the struct child_process using CHILD_PROCESS_INIT. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Aug 19, 2014 at 21:11 UTC
1f87293d78a4b2bd9265bac49b14a6f1111918b8
1 file changed
+8
-16
run-command.c
+8
-16
@@ -561,20 +561,6 @@ int run_command(struct child_process *cmd)
561
return finish_command(cmd);
562
}
563
564
-static void prepare_run_command_v_opt(struct child_process *cmd,
565
- const char **argv,
566
- int opt)
567
-{
568
- memset(cmd, 0, sizeof(*cmd));
569
- cmd->argv = argv;
570
- cmd->no_stdin = opt & RUN_COMMAND_NO_STDIN ? 1 : 0;
571
- cmd->git_cmd = opt & RUN_GIT_CMD ? 1 : 0;
572
- cmd->stdout_to_stderr = opt & RUN_COMMAND_STDOUT_TO_STDERR ? 1 : 0;
573
- cmd->silent_exec_failure = opt & RUN_SILENT_EXEC_FAILURE ? 1 : 0;
574
- cmd->use_shell = opt & RUN_USING_SHELL ? 1 : 0;
575
- cmd->clean_on_exit = opt & RUN_CLEAN_ON_EXIT ? 1 : 0;
576
-}
577
-
564
int run_command_v_opt(const char **argv, int opt)
565
{
566
return run_command_v_opt_cd_env(argv, opt, NULL, NULL);
@@ -582,8 +568,14 @@ int run_command_v_opt(const char **argv, int opt)
568
569
int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const char *const *env)
570
{
585
- struct child_process cmd;
586
- prepare_run_command_v_opt(&cmd, argv, opt);
571
+ struct child_process cmd = CHILD_PROCESS_INIT;
572
+ cmd.argv = argv;
573
+ cmd.no_stdin = opt & RUN_COMMAND_NO_STDIN ? 1 : 0;
574
+ cmd.git_cmd = opt & RUN_GIT_CMD ? 1 : 0;
575
+ cmd.stdout_to_stderr = opt & RUN_COMMAND_STDOUT_TO_STDERR ? 1 : 0;
576
+ cmd.silent_exec_failure = opt & RUN_SILENT_EXEC_FAILURE ? 1 : 0;
577
+ cmd.use_shell = opt & RUN_USING_SHELL ? 1 : 0;
578
+ cmd.clean_on_exit = opt & RUN_CLEAN_ON_EXIT ? 1 : 0;
579
cmd.dir = dir;
580
cmd.env = env;
581
return run_command(&cmd);