use appropriate typedefs

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
David Rientjes 2006-08-15 10:40:06 -07:00 committed by Junio C Hamano
parent 0bef57ee44
commit 6f002f984f
4 changed files with 8 additions and 8 deletions

View File

@ -44,9 +44,8 @@ static int finish_pack(const char *pack_tmp_name, const char *me)
for (;;) {
int status, code;
int retval = waitpid(pid, &status, 0);
if (retval < 0) {
if (waitpid(pid, &status, 0) < 0) {
if (errno == EINTR)
continue;
error("waitpid failed (%s)", strerror(errno));

View File

@ -11,7 +11,8 @@ static int err;
static void run_program(void)
{
int pid = fork(), status;
pid_t pid = fork();
int status;
if (pid < 0)
die("unable to fork");

View File

@ -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;

View File

@ -278,7 +278,7 @@ static void unlink_entry(char *name)
}
}
static volatile int progress_update = 0;
static volatile sig_atomic_t progress_update = 0;
static void progress_interval(int signum)
{