[PATCH 1/5] run-command: drop silent_exec_failure arg from wait_or_whine
- From
Jeff King <peff@peff.net>
- Date
- Nov 30, 2012, 22:40 UTC
- Message-ID
- <20121130224050.GA23772@sigill.intra.peff.net>
- In-Reply-To
- <20121130223943.GA27120@sigill.intra.peff.net>
We do not actually use this parameter; instead we complain from the child itself (for fork/exec) or from start_command (if we are using spawn on Windows).
Signed-off-by: Jeff King <peff@peff.net> --- run-command.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/run-command.c b/run-command.c index 3b982e4..3aae270 100644 --- a/run-command.c +++ b/run-command.c @@ -226,7 +226,7 @@ static inline void set_cloexec(int fd) fcntl(fd, F_SETFD, flags | FD_CLOEXEC); } -static int wait_or_whine(pid_t pid, const char *argv0, int silent_exec_failure) +static int wait_or_whine(pid_t pid, const char *argv0) { int status, code = -1; pid_t waiting; @@ -432,8 +432,7 @@ fail_pipe: * At this point we know that fork() succeeded, but execvp() * failed. Errors have been reported to our stderr. */ - wait_or_whine(cmd->pid, cmd->argv[0], - cmd->silent_exec_failure); + wait_or_whine(cmd->pid, cmd->argv[0]); failed_errno = errno; cmd->pid = -1; } @@ -538,7 +537,7 @@ int finish_command(struct child_process *cmd) int finish_command(struct child_process *cmd) { - return wait_or_whine(cmd->pid, cmd->argv[0], cmd->silent_exec_failure); + return wait_or_whine(cmd->pid, cmd->argv[0]); } int run_command(struct child_process *cmd)
-- 1.8.0.1.620.g558b0aa