From afdb269c76cb965cf8bbb1012c2ec0e2bf7172b1 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sat, 10 Mar 2007 03:27:52 -0500 Subject: [PATCH] Remove unused run_command variants We don't actually use these va_list based variants of run_command anymore. I'm removing them before I make further improvements. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- builtin-push.c | 2 +- run-command.c | 45 --------------------------------------------- run-command.h | 4 ---- 3 files changed, 1 insertion(+), 50 deletions(-) diff --git a/builtin-push.c b/builtin-push.c index 979efcc45..6ab9a28e8 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -336,7 +336,7 @@ static int do_push(const char *repo) argv[dest_argc] = NULL; if (verbose) fprintf(stderr, "Pushing to %s\n", dest); - err = run_command_v(argv); + err = run_command_v_opt(argv, 0); if (!err) continue; switch (err) { diff --git a/run-command.c b/run-command.c index cfbad74d1..94ace50a2 100644 --- a/run-command.c +++ b/run-command.c @@ -46,48 +46,3 @@ int run_command_v_opt(const char **argv, int flags) return 0; } } - -int run_command_v(const char **argv) -{ - return run_command_v_opt(argv, 0); -} - -static int run_command_va_opt(int opt, const char *cmd, va_list param) -{ - int argc; - const char *argv[MAX_RUN_COMMAND_ARGS]; - const char *arg; - - argv[0] = (char*) cmd; - argc = 1; - while (argc < MAX_RUN_COMMAND_ARGS) { - arg = argv[argc++] = va_arg(param, char *); - if (!arg) - break; - } - if (MAX_RUN_COMMAND_ARGS <= argc) - return error("too many args to run %s", cmd); - return run_command_v_opt(argv, opt); -} - -int run_command_opt(int opt, const char *cmd, ...) -{ - va_list params; - int r; - - va_start(params, cmd); - r = run_command_va_opt(opt, cmd, params); - va_end(params); - return r; -} - -int run_command(const char *cmd, ...) -{ - va_list params; - int r; - - va_start(params, cmd); - r = run_command_va_opt(0, cmd, params); - va_end(params); - return r; -} diff --git a/run-command.h b/run-command.h index 59c4476ce..2646d38ac 100644 --- a/run-command.h +++ b/run-command.h @@ -1,7 +1,6 @@ #ifndef RUN_COMMAND_H #define RUN_COMMAND_H -#define MAX_RUN_COMMAND_ARGS 256 enum { ERR_RUN_COMMAND_FORK = 10000, ERR_RUN_COMMAND_EXEC, @@ -15,8 +14,5 @@ enum { #define RUN_GIT_CMD 2 /*If this is to be git sub-command */ #define RUN_COMMAND_STDOUT_TO_STDERR 4 int run_command_v_opt(const char **argv, int opt); -int run_command_v(const char **argv); -int run_command_opt(int opt, const char *cmd, ...); -int run_command(const char *cmd, ...); #endif -- 2.26.2