gdb/

	Code cleanup.
	* dwarf2read.c (dw2_map_symbol_filenames): Use symbol_filename_ftype
	for fun.
	* psymtab.c (map_symbol_filenames_psymtab)
	(map_partial_symbol_filenames): Likewise.
	* psymtab.h: Include symfile.h.
	(map_partial_symbol_filenames): Use symbol_filename_ftype for fun.
	* symfile.h (symbol_filename_ftype): New.
	(struct quick_symbol_functions): Use symbol_filename_ftype for fun of
	map_symbol_filenames, clarify more the naming in comment.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e88f1c44aca39e692d0a03c9a590db7e6bbf1b4e..8962f1a96658278e0ca265fa14ada188fb0dd468 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2011-06-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       Code cleanup.
+       * dwarf2read.c (dw2_map_symbol_filenames): Use symbol_filename_ftype
+       for fun.
+       * psymtab.c (map_symbol_filenames_psymtab)
+       (map_partial_symbol_filenames): Likewise.
+       * psymtab.h: Include symfile.h.
+       (map_partial_symbol_filenames): Use symbol_filename_ftype for fun.
+       * symfile.h (symbol_filename_ftype): New.
+       (struct quick_symbol_functions): Use symbol_filename_ftype for fun of
+       map_symbol_filenames, clarify more the naming in comment.
+
 2011-06-07  Doug Evans  <dje@google.com>
 
        * cc-with-index.sh: Fix typos in comment.

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 29ca473eebdfd4bdb1946479c53ca6ebd20d7ea9..399d5932211e4550557d6afb311c8fb6a7773e72 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2720,8 +2720,7 @@ dw2_find_pc_sect_symtab (struct objfile *objfile,
 }
 
 static void
-dw2_map_symbol_filenames (struct objfile *objfile,
-                         void (*fun) (const char *, const char *, void *),
+dw2_map_symbol_filenames (struct objfile *objfile, symbol_filename_ftype *fun,
                          void *data)
 {
   int i;

diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index ea690ef644969f6334314114dd11bc4310b2312a..fd8bb7d4e7a9afbe49a1b1664a58f07a06407c18 100644 (file)
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -1082,9 +1082,7 @@ read_psymtabs_with_filename (struct objfile *objfile, const char *filename)
 
 static void
 map_symbol_filenames_psymtab (struct objfile *objfile,
-                             void (*fun) (const char *, const char *,
-                                          void *),
-                             void *data)
+                             symbol_filename_ftype *fun, void *data)
 {
   struct partial_symtab *ps;
 
@@ -1917,9 +1915,7 @@ expand_partial_symbol_names (int (*fun) (const char *, void *), void *data)
 }
 
 void
-map_partial_symbol_filenames (void (*fun) (const char *, const char *,
-                                          void *),
-                             void *data)
+map_partial_symbol_filenames (symbol_filename_ftype *fun, void *data)
 {
   struct objfile *objfile;
 

diff --git a/gdb/psymtab.h b/gdb/psymtab.h
index 086ff2fb6634c157ec42f7e40bcc8f93b6953773..4d7f6d6d8f75db59da6a6dad67730e54ab4b1512 100644 (file)
--- a/gdb/psymtab.h
+++ b/gdb/psymtab.h
@@ -20,6 +20,8 @@
 #ifndef PSYMTAB_H
 #define PSYMTAB_H
 
+#include "symfile.h"
+
 /* A bcache for partial symbols.  */
 
 struct psymbol_bcache;
@@ -31,9 +33,7 @@ extern struct bcache *psymbol_bcache_get_bcache (struct psymbol_bcache *);
 void expand_partial_symbol_names (int (*fun) (const char *, void *),
                                  void *data);
 
-void map_partial_symbol_filenames (void (*) (const char *, const char *,
-                                            void *),
-                                  void *);
+void map_partial_symbol_filenames (symbol_filename_ftype *fun, void *data);
 
 extern const struct quick_symbol_functions psym_functions;
 

diff --git a/gdb/symfile.h b/gdb/symfile.h
index 9c0bb752951c455c586a3b1083e32c982d249363..cc65a14140d0a7da7827f94c072641ec345baa9f 100644 (file)
--- a/gdb/symfile.h
+++ b/gdb/symfile.h
@@ -116,6 +116,11 @@ struct symfile_segment_data
   int *segment_info;
 };
 
+/* Callback for quick_symbol_functions->map_symbol_filenames.  */
+
+typedef void (symbol_filename_ftype) (const char *filename,
+                                     const char *fullname, void *data);
+
 /* The "quick" symbol functions exist so that symbol readers can
    avoiding an initial read of all the symbols.  For example, symbol
    readers might choose to use the "partial symbol table" utilities,
@@ -283,12 +288,10 @@ struct quick_symbol_functions
                                         int warn_if_readin);
 
   /* Call a callback for every file defined in OBJFILE whose symtab is
-     not already read in.  FUN is the callback.  It is passed the file's name,
-     the file's full name, and the DATA passed to this function.  */
+     not already read in.  FUN is the callback.  It is passed the file's
+     FILENAME, the file's FULLNAME, and the DATA passed to this function.  */
   void (*map_symbol_filenames) (struct objfile *objfile,
-                               void (*fun) (const char *, const char *,
-                                            void *),
-                               void *data);
+                               symbol_filename_ftype *fun, void *data);
 };
 
 /* Structure to keep track of symbol reading functions for various