From 07f694e74267c3d552397068d1300ce9b492d93a Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 18 Sep 2006 06:47:32 +0000 Subject: [PATCH] * savewd.c (savewd_restore): Don't shadow: s/status/child_status/. --- lib/ChangeLog | 4 ++++ lib/savewd.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 12f8fbea0..983ffabdb 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2006-09-18 Jim Meyering + + * savewd.c (savewd_restore): Don't shadow: s/status/child_status/. + 2006-09-15 Paul Eggert * dirchownmod.c: Don't include fcntl.h; no longer needed. diff --git a/lib/savewd.c b/lib/savewd.c index c9af955d6..7e992376f 100644 --- 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; -- 2.11.0