2 files changed, 3 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index cb847669deb..6c25f582eea 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-21  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * etags.c (Ada_funcs): Redo slightly to avoid overflow warning.
+
         etags: In Prolog functions, don't assume int fits in size_t.
         This avoids a warning with gcc -Wstrict-overflow.
         * etags.c (Prolog_functions, prolog_pr, prolog_atom): Use size_t,
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 0c14a0d1663..6cb321fe75e 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -4198,7 +4198,7 @@ Ada_funcs (FILE *inf)
           /* Skip a string i.e. "abcd". */
           if (inquote || (*dbp == '"'))
             {
-              dbp = etags_strchr ((inquote) ? dbp : dbp+1, '"');
+              dbp = etags_strchr (dbp + !inquote, '"');
               if (dbp != NULL)
                 {
                   inquote = FALSE;