summary refs log tree commit diff
path: root/io
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-04-07 20:25:36 +0000
committerUlrich Drepper <drepper@redhat.com>2006-04-07 20:25:36 +0000
commitcec4091671724d867d1bc80c37be9f50f572c8f7 (patch)
treebf605e22619cbbb365d4db0077084670fe9090ad /io
parent2035d91c389888fcf359698fecc20c05f7b583dd (diff)
downloadglibc-cec4091671724d867d1bc80c37be9f50f572c8f7.tar.gz
glibc-cec4091671724d867d1bc80c37be9f50f572c8f7.tar.xz
glibc-cec4091671724d867d1bc80c37be9f50f572c8f7.zip
* sysdeps/posix/tempname.c (__gen_tempname): Change attempts_min
	into a macro.  Use preprocessor to decide how to initialize
	attempts [Coverity CID 67].

	* io/fts.c (fts_build): Comment out dead code [Coverity CID 68].

	* sunrpc/rpc_parse.c (def_union): Comment out dead code
	[Coverity CID 70].

	* locale/programs/linereader.c (lr_token): Remove duplicate
	handling of EOF [Coverity CID 71].

	* locale/programs/ld-numeric.c (numeric_read) [case tok_grouping]:
	We bail out early if ignore_content is set, so there is no need to
	check it later again [Coverity CID 72].

	* inet/inet6_option.c (inet6_option_find): Check *tptrp for NULL,
	not tptrp [Coverity CID 73].

	* inet/inet6_option.c (inet6_option_next): Check *tptrp for NULL,
	not tptrp [Coverity CID 74].

	* misc/tsearch.c (__tsearch): Don't rotate tree if memory
	allocation failed [Coverity CID 78].
Diffstat (limited to 'io')
-rw-r--r--io/fts.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/io/fts.c b/io/fts.c
index 39c076a2c8..71400d1716 100644
--- a/io/fts.c
+++ b/io/fts.c
@@ -747,6 +747,10 @@ 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 (nlinks) {
 				p->fts_info = FTS_NS;
@@ -754,7 +758,9 @@ mem1:				saved_errno = errno;
 			} else
 				p->fts_info = FTS_NSOK;
 			p->fts_accpath = cur->fts_accpath;
-		} else if (nlinks == 0
+		} else
+#endif
+		if (nlinks == 0
 #if defined DT_DIR && defined _DIRENT_HAVE_D_TYPE
 			   || (nostat &&
 			       dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)