summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-12-31 02:55:15 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-31 06:22:14 (GMT)
commit9b0b50936ec76ad8e582d18d5bf54bc81c685e9b (patch)
tree1599e84bb2e53adbce3728f62d1c3c38d815a1e9
parentad1a382fbb3ecb1bb017854a470816c815cc46c9 (diff)
downloadgit-9b0b50936ec76ad8e582d18d5bf54bc81c685e9b.zip
git-9b0b50936ec76ad8e582d18d5bf54bc81c685e9b.tar.gz
git-9b0b50936ec76ad8e582d18d5bf54bc81c685e9b.tar.bz2
Remove unnecessary argc parameter from run_command_v.
The argc parameter is never used by the run_command_v family of functions. Instead they require that the passed argv[] be NULL terminated so they can rely on the operating system's execvp function to correctly pass the arguments to the new process. Making the caller pass the argc is just confusing, as the caller could be mislead into believing that the argc might take precendece over the argv, or that the argv does not need to be NULL terminated. So goodbye argc. Don't come back. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--builtin-push.c2
-rw-r--r--receive-pack.c4
-rw-r--r--run-command.c8
-rw-r--r--run-command.h4
4 files changed, 9 insertions, 9 deletions
diff --git a/builtin-push.c b/builtin-push.c
index b7412e8..7a3d2bb 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 59b682c..2b0ba63 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 492ad3e..d0330c3 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 70b477a..82a0861 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