From: Roland McGrath <roland@gnu.org>
Date: Thu, 26 Feb 2009 21:17:45 +0000 (+0000)
Subject: 2009-02-26  Roland McGrath  <roland@redhat.com>
X-Git-Tag: upstream/2.30~13796
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed8d4fa9ac25da4ad6cfccd3624ed9d838e67551;p=external%2Fglibc.git

2009-02-26  Roland McGrath  <roland@redhat.com>

	* shadow/lckpwdf.c (__lckpwdf): Move FLAGS inside block using it,
	avoids unused warning.
---

diff --git a/shadow/lckpwdf.c b/shadow/lckpwdf.c
index 2770fb5..746e14b 100644
--- a/shadow/lckpwdf.c
+++ b/shadow/lckpwdf.c
@@ -1,5 +1,5 @@
 /* Handle locking of password file.
-   Copyright (C) 1996, 1998, 2000, 2002, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1996,1998,2000,2002,2007,2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -83,7 +83,6 @@ static void noop_handler (int __sig);
 int
 __lckpwdf (void)
 {
-  int flags;
   sigset_t saved_set;			/* Saved set of caught signals.  */
   struct sigaction saved_act;		/* Saved signal action.  */
   sigset_t new_set;			/* New set of caught signals.  */
@@ -113,7 +112,7 @@ __lckpwdf (void)
 # endif
     {
       /* Make sure file gets correctly closed when process finished.  */
-      flags = __fcntl (lock_fd, F_GETFD, 0);
+      int flags = __fcntl (lock_fd, F_GETFD, 0);
       if (flags == -1)
 	/* Cannot get file flags.  */
 	RETURN_CLOSE_FD (-1);