diff options
| author | David Rientjes <rientjes@google.com> | 2006-08-15 10:40:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-15 16:12:09 -0700 |
| commit | 6f002f984f1d1ddfdae990582a423dc5263697ae (patch) | |
| tree | 54262c1e3a316ad90ddd1ee2892789b35bfd3b1f | |
| parent | 0bef57ee44a2f924ad0066b751a3c87888633f56 (diff) | |
| download | git-6f002f984f1d1ddfdae990582a423dc5263697ae.tar.gz | |
use appropriate typedefs
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | fetch-clone.c | 3 | ||||
| -rw-r--r-- | merge-index.c | 3 | ||||
| -rw-r--r-- | run-command.c | 8 | ||||
| -rw-r--r-- | unpack-trees.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/fetch-clone.c b/fetch-clone.c index 5e84c4620f..c5cf4776fa 100644 --- a/fetch-clone.c +++ b/fetch-clone.c @@ -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)); diff --git a/merge-index.c b/merge-index.c index 0498a6f45e..a9c8cc1f93 100644 --- a/merge-index.c +++ b/merge-index.c @@ -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"); diff --git a/run-command.c b/run-command.c index ca67ee9333..61908682b9 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; diff --git a/unpack-trees.c b/unpack-trees.c index a20639be70..e496d8cd31 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -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) { |