From: Jeff King <peff@peff.net>
To: Kalle Olavi Niemitalo <kon@iki.fi>
Cc: Paul Fox <pgf@foxharp.boston.ma.us>, git@vger.kernel.org
Subject: [PATCH 3/5] run-command: drop silent_exec_failure arg from wait_or_whine
Date: Sun, 11 Nov 2012 11:55:44 -0500 [thread overview]
Message-ID: <20121111165544.GC19850@sigill.intra.peff.net> (raw)
In-Reply-To: <20121111163100.GB13188@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>
---
Just a cleanup I noticed while in the area.
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 @@ fail_pipe:
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.207.gdf2154c
next prev parent reply other threads:[~2012-11-11 16:56 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-09 19:23 What's cooking in git.git (Nov 2012, #02; Fri, 9) Jeff King
2012-11-09 20:01 ` Ralf Thielow
2012-11-09 20:06 ` Ralf Thielow
2012-11-09 20:10 ` Jeff King
2012-11-09 20:27 ` Junio C Hamano
2012-11-10 0:38 ` Jeff King
2012-11-10 17:14 ` Junio C Hamano
2012-11-09 21:52 ` Kalle Olavi Niemitalo
2012-11-10 15:52 ` Paul Fox
2012-11-10 19:32 ` Kalle Olavi Niemitalo
2012-11-10 21:12 ` Andreas Schwab
2012-11-10 22:08 ` Paul Fox
2012-11-11 7:02 ` Kalle Olavi Niemitalo
2012-11-11 8:58 ` Andreas Schwab
2012-11-11 15:48 ` Jeff King
2012-11-11 16:31 ` [PATCH 0/5] ignore SIGINT while editor runs Jeff King
2012-11-11 16:55 ` [PATCH 1/5] launch_editor: refactor to use start/finish_command Jeff King
2012-11-11 16:55 ` [PATCH 2/5] launch_editor: ignore SIGINT while the editor has control Paul Fox
2012-11-12 17:44 ` Junio C Hamano
2012-11-12 19:47 ` Jeff King
2012-11-11 16:55 ` Jeff King [this message]
2012-11-11 18:13 ` [PATCH 3/5] run-command: drop silent_exec_failure arg from wait_or_whine Felipe Contreras
2012-11-11 16:56 ` [PATCH 4/5] run-command: do not warn about child death by SIGINT Jeff King
2012-11-11 16:57 ` [PATCH 5/5] launch_editor: propagate SIGINT from editor to git Jeff King
2012-11-11 19:48 ` Johannes Sixt
2012-11-30 20:24 ` Jeff King
2012-11-11 16:58 ` [PATCH 2/5] launch_editor: ignore SIGINT while the editor has control Jeff King
2012-11-11 18:27 ` [PATCH 0/5] ignore SIGINT while editor runs Paul Fox
2012-11-11 19:15 ` Krzysztof Mazur
2012-11-11 20:24 ` Paul Fox
2012-11-11 20:43 ` Krzysztof Mazur
2012-11-11 22:08 ` Andreas Schwab
2012-11-09 23:21 ` What's cooking in git.git (Nov 2012, #02; Fri, 9) Felipe Contreras
2012-11-10 0:33 ` Jeff King
2012-11-10 0:44 ` Felipe Contreras
2012-11-10 12:32 ` SZEDER Gábor
2012-11-10 19:13 ` Felipe Contreras
2012-11-10 19:56 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121111165544.GC19850@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=kon@iki.fi \
--cc=pgf@foxharp.boston.ma.us \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).