Fix more problems found by GCC 4.6.0's static checks.

2 files changed, 7 insertions, 4 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index f594efa588c..5007995e14e 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix a problem found by GCC 4.6.0's static checks.
+        * etags.c (just_read_file): Remove dummy variable and simplify.
+
 2011-03-27  Glenn Morris  <rgm@gnu.org>
 
         * emacsclient.c: Replace SIGTYPE with void.
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 6cb321fe75e..a2cdf26abc7 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -3978,10 +3978,8 @@ Yacc_entries (FILE *inf)
 static void
 just_read_file (FILE *inf)
 {
-  register char *dummy;
-
-  LOOP_ON_INPUT_LINES (inf, lb, dummy)
-    continue;
+  while (!feof (inf))
+    readline (&lb, inf);
 }