提交 afdb269c 编写于 作者: S Shawn O. Pearce 提交者: Junio C Hamano

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: NShawn O. Pearce <spearce@spearce.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 497bdc88
...@@ -336,7 +336,7 @@ static int do_push(const char *repo) ...@@ -336,7 +336,7 @@ static int do_push(const char *repo)
argv[dest_argc] = NULL; argv[dest_argc] = NULL;
if (verbose) if (verbose)
fprintf(stderr, "Pushing to %s\n", dest); fprintf(stderr, "Pushing to %s\n", dest);
err = run_command_v(argv); err = run_command_v_opt(argv, 0);
if (!err) if (!err)
continue; continue;
switch (err) { switch (err) {
......
...@@ -46,48 +46,3 @@ int run_command_v_opt(const char **argv, int flags) ...@@ -46,48 +46,3 @@ int run_command_v_opt(const char **argv, int flags)
return 0; 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;
}
#ifndef RUN_COMMAND_H #ifndef RUN_COMMAND_H
#define RUN_COMMAND_H #define RUN_COMMAND_H
#define MAX_RUN_COMMAND_ARGS 256
enum { enum {
ERR_RUN_COMMAND_FORK = 10000, ERR_RUN_COMMAND_FORK = 10000,
ERR_RUN_COMMAND_EXEC, ERR_RUN_COMMAND_EXEC,
...@@ -15,8 +14,5 @@ enum { ...@@ -15,8 +14,5 @@ enum {
#define RUN_GIT_CMD 2 /*If this is to be git sub-command */ #define RUN_GIT_CMD 2 /*If this is to be git sub-command */
#define RUN_COMMAND_STDOUT_TO_STDERR 4 #define RUN_COMMAND_STDOUT_TO_STDERR 4
int run_command_v_opt(const char **argv, int opt); 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 #endif
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册