summary refs log tree commit diff
path: root/io
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2011-06-10 12:45:09 -0700
committerRoland McGrath <roland@hack.frob.com>2011-06-10 22:44:20 -0700
commit5615eaf26469f20c2d8c3be5770e12564a1edfff (patch)
treecf9eb7a5797cd7c9dd4680b0463859dcd8376328 /io
parentb68e08db76547937ea6e1902e87a5ea98c906f0c (diff)
downloadglibc-5615eaf26469f20c2d8c3be5770e12564a1edfff.tar.gz
glibc-5615eaf26469f20c2d8c3be5770e12564a1edfff.tar.xz
glibc-5615eaf26469f20c2d8c3be5770e12564a1edfff.zip
Quash some new warnings from GCC 4.6.
Diffstat (limited to 'io')
-rw-r--r--io/fts.c7
1 files changed, 2 insertions, 5 deletions
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)