Convert linespec.c:iterate_over_all_matching_symtabs

This converts linespec.c:iterate_over_all_matching_symtabs to the
callback approach, merging the search loop and the call to
expand_symtabs_matching.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=16994
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=16998
Acked-By: Simon Marchi <simon.marchi@efficios.com>

diff --git a/gdb/linespec.c b/gdb/linespec.c
index 70e2af9441995af40b21d8edf87fc4caff17bc7e..2fd32a9ac5cd138d18c81ccf361d0453df390b3f 100644 (file)
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -1139,12 +1139,7 @@ iterate_over_all_matching_symtabs
 
       for (objfile *objfile : pspace->objfiles ())
        {
-         objfile->expand_symtabs_matching (NULL, &lookup_name, NULL, NULL,
-                                           (SEARCH_GLOBAL_BLOCK
-                                            | SEARCH_STATIC_BLOCK),
-                                           domain);
-
-         for (compunit_symtab *cu : objfile->compunits ())
+         auto expand_callback = [&] (compunit_symtab *cu)
            {
              struct symtab *symtab = cu->primary_filetab ();
 
@@ -1171,7 +1166,15 @@ iterate_over_all_matching_symtabs
                         });
                    }
                }
-           }
+
+             return true;
+           };
+
+         objfile->expand_symtabs_matching (nullptr, &lookup_name,
+                                           nullptr, expand_callback,
+                                           (SEARCH_GLOBAL_BLOCK
+                                            | SEARCH_STATIC_BLOCK),
+                                           domain);
        }
     }
 }