* savewd.c (savewd_restore): Don't shadow: s/status/child_status/.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 12f8fbea057b4ce0fe3b0915c1b037bb6c45d0d7..983ffabdb78cd0fccc5bfa2686e04b6ab7553c29 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-18  Jim Meyering  <jim@meyering.net>
+
+       * savewd.c (savewd_restore): Don't shadow: s/status/child_status/.
+
 2006-09-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        * dirchownmod.c: Don't include fcntl.h; no longer needed.

diff --git a/lib/savewd.c b/lib/savewd.c
index c9af955d6c8bd7313c49eb9e7c44a693dbbb2bfe..7e992376ff36af9b9268f4bf80cedebd4c6fd92b 100644 (file)
--- a/lib/savewd.c
+++ b/lib/savewd.c
@@ -201,13 +201,13 @@ savewd_restore (struct savewd *wd, int status)
          _exit (status);
        if (0 < child)
          {
-           int status;
-           while (waitpid (child, &status, 0) < 0)
+           int child_status;
+           while (waitpid (child, &child_status, 0) < 0)
              assert (errno == EINTR);
            wd->val.child = -1;
-           if (! WIFEXITED (status))
-             raise (WTERMSIG (status));
-           return WEXITSTATUS (status);
+           if (! WIFEXITED (child_status))
+             raise (WTERMSIG (child_status));
+           return WEXITSTATUS (child_status);
          }
       }
       break;