replace and remove run_command_v_opt_tr2()

The convenience function run_command_v_opt_tr2() is only used by a
single caller.  Use struct child_process and run_command() directly
instead and remove the underused function.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Taylor Blau <me@ttaylorr.com>

diff --git a/fsmonitor-ipc.c b/fsmonitor-ipc.c
index c0f42301c849c7d697816a0e56577283dba32949..19d772f0f3ae3737d70e69837ff0d9aa3021da62 100644 (file)
--- a/fsmonitor-ipc.c
+++ b/fsmonitor-ipc.c
@@ -54,10 +54,14 @@ enum ipc_active_state fsmonitor_ipc__get_state(void)
 
 static int spawn_daemon(void)
 {
-       const char *args[] = { "fsmonitor--daemon", "start", NULL };
+       struct child_process cmd = CHILD_PROCESS_INIT;
 
-       return run_command_v_opt_tr2(args, RUN_COMMAND_NO_STDIN | RUN_GIT_CMD,
-                                   "fsmonitor");
+       cmd.git_cmd = 1;
+       cmd.no_stdin = 1;
+       cmd.trace2_child_class = "fsmonitor";
+       strvec_pushl(&cmd.args, "fsmonitor--daemon", "start", NULL);
+
+       return run_command(&cmd);
 }
 
 int fsmonitor_ipc__send_query(const char *since_token,

diff --git a/run-command.c b/run-command.c
index 1c9ed510f844b683c5328a573e138e9249848871..32fa4b0ed62dfb34e25bcf2baed229c267cdfb77 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -1009,11 +1009,6 @@ int run_command_v_opt(const char **argv, int opt)
        return run_command_v_opt_cd_env_tr2(argv, opt, NULL, NULL, NULL);
 }
 
-int run_command_v_opt_tr2(const char **argv, int opt, const char *tr2_class)
-{
-       return run_command_v_opt_cd_env_tr2(argv, opt, NULL, NULL, tr2_class);
-}
-
 int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir,
                                 const char *const *env, const char *tr2_class)
 {

diff --git a/run-command.h b/run-command.h
index 39e5eae8bac4020ab0fc84176c2e5cca6851bd05..1bfa18575ee244952339797044d8b8a89841e94a 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -244,7 +244,6 @@ int run_auto_maintenance(int quiet);
  * corresponds to the member .env.
  */
 int run_command_v_opt(const char **argv, int opt);
-int run_command_v_opt_tr2(const char **argv, int opt, const char *tr2_class);
 /*
  * env (the environment) is to be formatted like environ: "VAR=VALUE".
  * To unset an environment variable use just "VAR".