From 5615eaf26469f20c2d8c3be5770e12564a1edfff Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Fri, 10 Jun 2011 12:45:09 -0700
Subject: Quash some new warnings from GCC 4.6.

---
 io/fts.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'io/fts.c')

diff --git a/io/fts.c b/io/fts.c
index 8e628b481d..5ba202b8aa 100644
--- a/io/fts.c
+++ b/io/fts.c
@@ -748,20 +748,17 @@ mem1:				saved_errno = errno;
 			p->fts_flags |= FTS_ISW;
 #endif
 
-#if 0
 		/* Unreachable code.  cderrno is only ever set to a nonnull
 		   value if dirp is closed at the same time.  But then we
 		   cannot enter this loop.  */
-		if (cderrno) {
+		if (0 && cderrno) {
 			if (nlinks) {
 				p->fts_info = FTS_NS;
 				p->fts_errno = cderrno;
 			} else
 				p->fts_info = FTS_NSOK;
 			p->fts_accpath = cur->fts_accpath;
-		} else
-#endif
-		if (nlinks == 0
+		} else if (nlinks == 0
 #if defined DT_DIR && defined _DIRENT_HAVE_D_TYPE
 			   || (nostat &&
 			       dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
-- 
cgit 1.4.1