[5599] apropos_in_all_indices file duplicates

[Gavin D. Smith]

Revision: 5599
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5599
Author:   gavin
Date:     2014-05-24 01:51:03 +0000 (Sat, 24 May 2014)
Log Message:
-----------
apropos_in_all_indices file duplicates

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/indices.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-05-23 22:10:57 UTC (rev 5598)
+++ trunk/ChangeLog     2014-05-24 01:51:03 UTC (rev 5599)
@@ -1,3 +1,8 @@
+2014-05-24  Gavin Smith  <address@hidden>
+
+       * info/indices.c (apropos_in_all_indices): Fix code for avoiding
+       reading the same file twice.
+
 2014-05-23  Gavin Smith  <address@hidden>
 
        * info/indices.c (info_indices_of_file_buffer): Slightly more

Modified: trunk/info/indices.c
===================================================================
--- trunk/info/indices.c        2014-05-23 22:10:57 UTC (rev 5598)
+++ trunk/info/indices.c        2014-05-24 01:51:03 UTC (rev 5599)
@@ -526,14 +526,17 @@
       REFERENCE **this_index, *this_item;
       FILE_BUFFER *this_fb;
 
+      this_item = dir_menu[dir_index];
+
       /* If we already scanned this file, don't do that again.
          In addition to being faster, this also avoids having
          multiple identical entries in the *Apropos* menu.  */
       for (i = 0; i < dir_index; i++)
         if (FILENAME_CMP (this_item->filename, dir_menu[i]->filename) == 0)
-          continue;
+          break;
+      if (i < dir_index)
+        continue;
 
-      this_item = dir_menu[dir_index];
       this_fb = info_find_file (this_item->filename);
 
       if (!this_fb)