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 <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn O. Pearce committed
Mar 10, 2007 at 03:27 UTC
afdb269c76cb965cf8bbb1012c2ec0e2bf7172b1
3 files changed
+1
-50
builtin-push.c
+1
-1
@@ -336,7 +336,7 @@ static int do_push(const char *repo)
336
argv[dest_argc] = NULL;
337
if (verbose)
338
fprintf(stderr, "Pushing to %s\n", dest);
339
- err = run_command_v(argv);
339
+ err = run_command_v_opt(argv, 0);
340
if (!err)
341
continue;
342
switch (err) {
run-command.c
-45
@@ -46,48 +46,3 @@ int run_command_v_opt(const char **argv, int flags)
46
return 0;
47
}
48
}
49
-
50
-int run_command_v(const char **argv)
51
-{
52
- return run_command_v_opt(argv, 0);
53
-}
54
-
55
-static int run_command_va_opt(int opt, const char *cmd, va_list param)
56
-{
57
- int argc;
58
- const char *argv[MAX_RUN_COMMAND_ARGS];
59
- const char *arg;
60
-
61
- argv[0] = (char*) cmd;
62
- argc = 1;
63
- while (argc < MAX_RUN_COMMAND_ARGS) {
64
- arg = argv[argc++] = va_arg(param, char *);
65
- if (!arg)
66
- break;
67
- }
68
- if (MAX_RUN_COMMAND_ARGS <= argc)
69
- return error("too many args to run %s", cmd);
70
- return run_command_v_opt(argv, opt);
71
-}
72
-
73
-int run_command_opt(int opt, const char *cmd, ...)
74
-{
75
- va_list params;
76
- int r;
77
-
78
- va_start(params, cmd);
79
- r = run_command_va_opt(opt, cmd, params);
80
- va_end(params);
81
- return r;
82
-}
83
-
84
-int run_command(const char *cmd, ...)
85
-{
86
- va_list params;
87
- int r;
88
-
89
- va_start(params, cmd);
90
- r = run_command_va_opt(0, cmd, params);
91
- va_end(params);
92
- return r;
93
-}
run-command.h
-4
@@ -1,7 +1,6 @@
1
#ifndef RUN_COMMAND_H
2
#define RUN_COMMAND_H
3
4
-#define MAX_RUN_COMMAND_ARGS 256
4
enum {
5
ERR_RUN_COMMAND_FORK = 10000,
6
ERR_RUN_COMMAND_EXEC,
@@ -15,8 +14,5 @@ enum {
14
#define RUN_GIT_CMD 2 /*If this is to be git sub-command */
15
#define RUN_COMMAND_STDOUT_TO_STDERR 4
16
int run_command_v_opt(const char **argv, int opt);
18
-int run_command_v(const char **argv);
19
-int run_command_opt(int opt, const char *cmd, ...);
20
-int run_command(const char *cmd, ...);
17
18
#endif