summaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorDoug Evans <dje@google.com>2013-09-25 21:44:10 +0000
committerDoug Evans <dje@google.com>2013-09-25 21:44:10 +0000
commitabbb8426a7f6303441551f242cf351bb5afa2ce5 (patch)
tree254b41c8f577672800fb8c61a3d7b636ed83a328 /gdb
parent536e181d49fe621583d88b04201909693c05e733 (diff)
downloadgdb-abbb8426a7f6303441551f242cf351bb5afa2ce5.tar.gz
* symfile.h (struct quick_symbol_functions): Reorg arg list of
map_matching_symbols so objfile is first. All uses updated. * dwarf2read.c (dw2_map_matching_symbols): Update signature. * psymtab.c (map_matching_symbols_psymtab): Update signature.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/ada-lang.c8
-rw-r--r--gdb/dwarf2read.c5
-rw-r--r--gdb/psymtab.c5
-rw-r--r--gdb/symfile.h5
5 files changed, 20 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 44ffc1f3a5f..68c0a7dbfe2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2013-09-25 Doug Evans <dje@google.com>
+
+ * symfile.h (struct quick_symbol_functions): Reorg arg list of
+ map_matching_symbols so objfile is first. All uses updated.
+ * dwarf2read.c (dw2_map_matching_symbols): Update signature.
+ * psymtab.c (map_matching_symbols_psymtab): Update signature.
+
2013-09-25 Andreas Arnez <arnez@linux.vnet.ibm.com>
PR shlibs/8882
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index f29c3516f3b..d2b0ed2eff6 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -5040,11 +5040,11 @@ add_nonlocal_symbols (struct obstack *obstackp, const char *name,
data.objfile = objfile;
if (is_wild_match)
- objfile->sf->qf->map_matching_symbols (name, domain, objfile, global,
+ objfile->sf->qf->map_matching_symbols (objfile, name, domain, global,
aux_add_nonlocal_symbols, &data,
wild_match, NULL);
else
- objfile->sf->qf->map_matching_symbols (name, domain, objfile, global,
+ objfile->sf->qf->map_matching_symbols (objfile, name, domain, global,
aux_add_nonlocal_symbols, &data,
full_match, compare_names);
}
@@ -5057,8 +5057,8 @@ add_nonlocal_symbols (struct obstack *obstackp, const char *name,
strcpy (name1, "_ada_");
strcpy (name1 + sizeof ("_ada_") - 1, name);
data.objfile = objfile;
- objfile->sf->qf->map_matching_symbols (name1, domain,
- objfile, global,
+ objfile->sf->qf->map_matching_symbols (objfile, name1, domain,
+ global,
aux_add_nonlocal_symbols,
&data,
full_match, compare_names);
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 14d9a32a007..be2093ab185 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -3478,8 +3478,9 @@ dw2_expand_symtabs_with_fullname (struct objfile *objfile,
}
static void
-dw2_map_matching_symbols (const char * name, domain_enum namespace,
- struct objfile *objfile, int global,
+dw2_map_matching_symbols (struct objfile *objfile,
+ const char * name, domain_enum namespace,
+ int global,
int (*callback) (struct block *,
struct symbol *, void *),
void *data, symbol_compare_ftype *match,
diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index feea823c67a..8eac5e134fd 100644
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -1238,8 +1238,9 @@ map_block (const char *name, domain_enum namespace, struct objfile *objfile,
the definition of quick_symbol_functions in symfile.h. */
static void
-map_matching_symbols_psymtab (const char *name, domain_enum namespace,
- struct objfile *objfile, int global,
+map_matching_symbols_psymtab (struct objfile *objfile,
+ const char *name, domain_enum namespace,
+ int global,
int (*callback) (struct block *,
struct symbol *, void *),
void *data,
diff --git a/gdb/symfile.h b/gdb/symfile.h
index ac5b711116e..b08941123dc 100644
--- a/gdb/symfile.h
+++ b/gdb/symfile.h
@@ -237,8 +237,9 @@ struct quick_symbol_functions
CALLBACK returns 0 to indicate that the scan should continue, or
non-zero to indicate that the scan should be terminated. */
- void (*map_matching_symbols) (const char *name, domain_enum namespace,
- struct objfile *, int global,
+ void (*map_matching_symbols) (struct objfile *,
+ const char *name, domain_enum namespace,
+ int global,
int (*callback) (struct block *,
struct symbol *, void *),
void *data,