diff options
| author | Doug Evans <dje@google.com> | 2014-01-14 18:30:31 -0800 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 2014-01-14 18:30:31 -0800 |
| commit | 206f2a5777679e6d1ad21ce435f6e7af92e2d41a (patch) | |
| tree | a4fa8416d471b8b535238214a70235df78c4022e /gdb/psymtab.c | |
| parent | 540c2971fa25a14ae16a9bb14ba2f424b5f1ea96 (diff) | |
psymtab cleanup patch 2/3
This patch adds two typedefs:
expand_symtabs_file_matcher_ftype
expand_symtabs_symbol_matcher_ftype
It also renames the NAME_MATCHER argument in expand_symtabs_matching.
The function is named expand_symtabs_matching and it takes a name_matcher
argument. Name of what? The symtab? A symbol?
I made it SYMBOL_MATCHER to make it clearer.
* symfile.h (expand_symtabs_file_matcher_ftype): New typedef.
(expand_symtabs_symbol_matcher_ftype): New typedef.
(quick_symbol_functions.expand_symtabs_matching): Update to use.
expand_symtabs_file_matcher_ftype, expand_symtabs_symbol_matcher_ftype.
* symfile.c (expand_partial_symbol_names): Update to use
expand_symtabs_symbol_matcher_ftype.
* dwarf2read.c (dw2_expand_symtabs_matching): Update to use
expand_symtabs_file_matcher_ftype, expand_symtabs_symbol_matcher_ftype.
Arg name_matcher renamed to symbol_matcher.
* psymtab.c (recursively_search_psymtabs): Update to use
expand_symtabs_symbol_matcher_ftype. Arg name_matcher renamed to
sym_matcher.
(expand_symtabs_matching_via_partial): Update to use
expand_symtabs_file_matcher_ftype, expand_symtabs_symbol_matcher_ftype.
Arg name_matcher renamed to symbol_matcher.
Diffstat (limited to 'gdb/psymtab.c')
| -rw-r--r-- | gdb/psymtab.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gdb/psymtab.c b/gdb/psymtab.c index ce45589396..457b91a3fd 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -1281,7 +1281,7 @@ static int recursively_search_psymtabs (struct partial_symtab *ps, struct objfile *objfile, enum search_domain kind, - int (*name_matcher) (const char *, void *), + expand_symtabs_symbol_matcher_ftype *sym_matcher, void *data) { struct partial_symbol **psym; @@ -1304,7 +1304,7 @@ recursively_search_psymtabs (struct partial_symtab *ps, continue; r = recursively_search_psymtabs (ps->dependencies[i], - objfile, kind, name_matcher, data); + objfile, kind, sym_matcher, data); if (r != 0) { ps->searched_flag = PST_SEARCHED_AND_FOUND; @@ -1346,7 +1346,7 @@ recursively_search_psymtabs (struct partial_symtab *ps, && PSYMBOL_CLASS (*psym) == LOC_BLOCK) || (kind == TYPES_DOMAIN && PSYMBOL_CLASS (*psym) == LOC_TYPEDEF)) - && (*name_matcher) (SYMBOL_SEARCH_NAME (*psym), data)) + && (*sym_matcher) (SYMBOL_SEARCH_NAME (*psym), data)) { /* Found a match, so notify our caller. */ result = PST_SEARCHED_AND_FOUND; @@ -1363,8 +1363,8 @@ recursively_search_psymtabs (struct partial_symtab *ps, static void expand_symtabs_matching_via_partial (struct objfile *objfile, - int (*file_matcher) (const char *, void *, int basenames), - int (*name_matcher) (const char *, void *), + expand_symtabs_file_matcher_ftype *file_matcher, + expand_symtabs_symbol_matcher_ftype *symbol_matcher, enum search_domain kind, void *data) { @@ -1406,7 +1406,7 @@ expand_symtabs_matching_via_partial continue; } - if (recursively_search_psymtabs (ps, objfile, kind, name_matcher, data)) + if (recursively_search_psymtabs (ps, objfile, kind, symbol_matcher, data)) psymtab_to_symtab (objfile, ps); } } |