Skip to content

Commit

Permalink
run-command: drop silent_exec_failure arg from wait_or_whine
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Dec 2, 2012
1 parent f07e555 commit 1327452
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions run-command.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -432,8 +432,7 @@ int start_command(struct child_process *cmd)
* 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;
}
Expand Down Expand Up @@ -538,7 +537,7 @@ int start_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)
Expand Down

0 comments on commit 1327452

Please sign in to comment.