summaryrefslogtreecommitdiff
path: root/run-command.c
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2006-08-15 17:40:06 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-15 23:12:09 (GMT)
commit6f002f984f1d1ddfdae990582a423dc5263697ae (patch)
tree54262c1e3a316ad90ddd1ee2892789b35bfd3b1f /run-command.c
parent0bef57ee44a2f924ad0066b751a3c87888633f56 (diff)
downloadgit-6f002f984f1d1ddfdae990582a423dc5263697ae.zip
git-6f002f984f1d1ddfdae990582a423dc5263697ae.tar.gz
git-6f002f984f1d1ddfdae990582a423dc5263697ae.tar.bz2
use appropriate typedefs
Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'run-command.c')
-rw-r--r--run-command.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/run-command.c b/run-command.c
index ca67ee9..6190868 100644
--- a/run-command.c
+++ b/run-command.c
@@ -25,15 +25,15 @@ int run_command_v_opt(int argc, const char **argv, int flags)
}
for (;;) {
int status, code;
- int retval = waitpid(pid, &status, 0);
+ pid_t waiting = waitpid(pid, &status, 0);
- if (retval < 0) {
+ if (waiting < 0) {
if (errno == EINTR)
continue;
- error("waitpid failed (%s)", strerror(retval));
+ error("waitpid failed (%s)", strerror(errno));
return -ERR_RUN_COMMAND_WAITPID;
}
- if (retval != pid)
+ if (waiting != pid)
return -ERR_RUN_COMMAND_WAITPID_WRONG_PID;
if (WIFSIGNALED(status))
return -ERR_RUN_COMMAND_WAITPID_SIGNAL;