record-full: Remove unused function netorder16

[deliverable/binutils-gdb.git] / gdb / symfile-debug.c

diff --git a/gdb/symfile-debug.c b/gdb/symfile-debug.c
index 80039a015e729640d3ac65157db49d8876035cbe..5ca1fa73fff2d64755f89a09be7870caea9bcce7 100644 (file)
--- a/gdb/symfile-debug.c
+++ b/gdb/symfile-debug.c
@@ -117,28 +117,23 @@ debug_qf_forget_cached_source_info (struct objfile *objfile)
   debug_data->real_sf->qf->forget_cached_source_info (objfile);
 }
 
-static int
-debug_qf_map_symtabs_matching_filename (struct objfile *objfile,
-                                       const char *name,
-                                       const char *real_path,
-                                       int (*callback) (struct symtab *,
-                                                        void *),
-                                       void *data)
+static bool
+debug_qf_map_symtabs_matching_filename
+  (struct objfile *objfile, const char *name, const char *real_path,
+   gdb::function_view<bool (symtab *)> callback)
 {
   const struct debug_sym_fns_data *debug_data
     = ((const struct debug_sym_fns_data *)
        objfile_data (objfile, symfile_debug_objfile_data_key));
-  int retval;
 
   fprintf_filtered (gdb_stdlog,
-                   "qf->map_symtabs_matching_filename (%s, \"%s\", \"%s\", %s, %s)\n",
+                   "qf->map_symtabs_matching_filename (%s, \"%s\", \"%s\", %s)\n",
                    objfile_debug_name (objfile), name,
                    real_path ? real_path : NULL,
-                   host_address_to_string (callback),
-                   host_address_to_string (data));
+                   host_address_to_string (&callback));
 
-  retval = debug_data->real_sf->qf->map_symtabs_matching_filename
-    (objfile, name, real_path, callback, data);
+  bool retval = (debug_data->real_sf->qf->map_symtabs_matching_filename
+                (objfile, name, real_path, callback));
 
   fprintf_filtered (gdb_stdlog,
                    "qf->map_symtabs_matching_filename (...) = %d\n",
@@ -291,29 +286,28 @@ debug_qf_map_matching_symbols (struct objfile *objfile,
 static void
 debug_qf_expand_symtabs_matching
   (struct objfile *objfile,
-   expand_symtabs_file_matcher_ftype *file_matcher,
-   expand_symtabs_symbol_matcher_ftype *symbol_matcher,
-   expand_symtabs_exp_notify_ftype *expansion_notify,
-   enum search_domain kind, void *data)
+   gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
+   gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
+   gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
+   enum search_domain kind)
 {
   const struct debug_sym_fns_data *debug_data
     = ((const struct debug_sym_fns_data *)
        objfile_data (objfile, symfile_debug_objfile_data_key));
 
   fprintf_filtered (gdb_stdlog,
-                   "qf->expand_symtabs_matching (%s, %s, %s, %s, %s, %s)\n",
+                   "qf->expand_symtabs_matching (%s, %s, %s, %s, %s)\n",
                    objfile_debug_name (objfile),
-                   host_address_to_string (file_matcher),
-                   host_address_to_string (symbol_matcher),
-                   host_address_to_string (expansion_notify),
-                   search_domain_name (kind),
-                   host_address_to_string (data));
+                   host_address_to_string (&file_matcher),
+                   host_address_to_string (&symbol_matcher),
+                   host_address_to_string (&expansion_notify),
+                   search_domain_name (kind));
 
   debug_data->real_sf->qf->expand_symtabs_matching (objfile,
                                                    file_matcher,
                                                    symbol_matcher,
                                                    expansion_notify,
-                                                   kind, data);
+                                                   kind);
 }
 
 static struct compunit_symtab *