diff options
| -rw-r--r-- | builtin-push.c | 2 | ||||
| -rw-r--r-- | receive-pack.c | 4 | ||||
| -rw-r--r-- | run-command.c | 8 | ||||
| -rw-r--r-- | run-command.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/builtin-push.c b/builtin-push.c index b7412e8293..7a3d2bb064 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -275,7 +275,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(argc, argv); + err = run_command_v(argv); if (!err) continue; switch (err) { diff --git a/receive-pack.c b/receive-pack.c index 59b682c03a..2b0ba638af 100644 --- a/receive-pack.c +++ b/receive-pack.c @@ -187,7 +187,7 @@ static void run_update_post_hook(struct command *cmd) argc++; } argv[argc] = NULL; - run_command_v_opt(argc, argv, RUN_COMMAND_NO_STDIO); + run_command_v_opt(argv, RUN_COMMAND_NO_STDIO); } /* @@ -283,7 +283,7 @@ static const char *unpack(void) unpacker[0] = "unpack-objects"; unpacker[1] = hdr_arg; unpacker[2] = NULL; - code = run_command_v_opt(1, unpacker, RUN_GIT_CMD); + code = run_command_v_opt(unpacker, RUN_GIT_CMD); switch (code) { case 0: return NULL; diff --git a/run-command.c b/run-command.c index 492ad3e64c..d0330c3793 100644 --- a/run-command.c +++ b/run-command.c @@ -2,7 +2,7 @@ #include "run-command.h" #include "exec_cmd.h" -int run_command_v_opt(int argc, const char **argv, int flags) +int run_command_v_opt(const char **argv, int flags) { pid_t pid = fork(); @@ -46,9 +46,9 @@ int run_command_v_opt(int argc, const char **argv, int flags) } } -int run_command_v(int argc, const char **argv) +int run_command_v(const char **argv) { - return run_command_v_opt(argc, argv, 0); + return run_command_v_opt(argv, 0); } int run_command(const char *cmd, ...) @@ -69,5 +69,5 @@ int run_command(const char *cmd, ...) va_end(param); if (MAX_RUN_COMMAND_ARGS <= argc) return error("too many args to run %s", cmd); - return run_command_v_opt(argc, argv, 0); + return run_command_v_opt(argv, 0); } diff --git a/run-command.h b/run-command.h index 70b477a748..82a0861f23 100644 --- a/run-command.h +++ b/run-command.h @@ -13,8 +13,8 @@ enum { #define RUN_COMMAND_NO_STDIO 1 #define RUN_GIT_CMD 2 /*If this is to be git sub-command */ -int run_command_v_opt(int argc, const char **argv, int opt); -int run_command_v(int argc, const char **argv); +int run_command_v_opt(const char **argv, int opt); +int run_command_v(const char **argv); int run_command(const char *cmd, ...); #endif |