diff options
| author | René Scharfe <l.s.r@web.de> | 2022-10-30 14:52:40 +0300 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:48 +0300 |
| commit | d82dbbd849fadd9d61d9489a03b429b6d1413c81 (patch) | |
| tree | 5363081cc9cfa212facf594778e0ee458cbdc8dc | |
| parent | eb5b6b57d0e9fba0e50871ece4ea79e76cd61a36 (diff) | |
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>
| -rw-r--r-- | fsmonitor-ipc.c | 10 | ||||
| -rw-r--r-- | run-command.c | 5 | ||||
| -rw-r--r-- | run-command.h | 1 |
3 files changed, 7 insertions, 9 deletions
diff --git a/fsmonitor-ipc.c b/fsmonitor-ipc.c index c0f42301c84..19d772f0f3a 100644 --- 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 1c9ed510f84..32fa4b0ed62 100644 --- 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 39e5eae8bac..1bfa18575ee 100644 --- 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". |