X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=run-command.c;h=61908682b9b251ac49ae655522a3143476a888ea;hb=e70866f53a8d31cde6cfff6396ba0d1f64029afb;hp=ca67ee9333e1f4125678fe607f44d75becc3cf7e;hpb=7be14b49ac14da65764a115d7cb64c8a72ab5b61;p=git.git

diff --git a/run-command.c b/run-command.c
index ca67ee933..61908682b 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;