diff options
| author | Doug Evans <xdje42@gmail.com> | 2014-12-11 09:55:29 -0800 |
|---|---|---|
| committer | Doug Evans <xdje42@gmail.com> | 2014-12-11 09:55:29 -0800 |
| commit | fe2a438d598329ed45cd7552565085068883276e (patch) | |
| tree | 68e56aad8a644fc68ce5a854baf47aa032d8ae2a | |
| parent | 8acbedd60e1045bf8d37b29ddd25c2c8b6a302a9 (diff) | |
| download | binutils-fe2a438d598329ed45cd7552565085068883276e.zip binutils-fe2a438d598329ed45cd7552565085068883276e.tar.gz binutils-fe2a438d598329ed45cd7552565085068883276e.tar.bz2 | |
(lookup_global_symbol_from_objfile): Simplify.
gdb/ChangeLog:
* symtab.c (lookup_symbol_in_objfile_symtabs): Delete forward decl.
(symbol *lookup_symbol_via_quick_fns): Ditto.
(lookup_symbol_in_objfile): Add forward decl.
(lookup_global_symbol_from_objfile): Simplify, call
lookup_symbol_in_objfile.
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/symtab.c | 22 |
2 files changed, 13 insertions, 17 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e4e32ff..f5f8018 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2014-12-11 Doug Evans <xdje42@gmail.com> + * symtab.c (lookup_symbol_in_objfile_symtabs): Delete forward decl. + (symbol *lookup_symbol_via_quick_fns): Ditto. + (lookup_symbol_in_objfile): Add forward decl. + (lookup_global_symbol_from_objfile): Simplify, call + lookup_symbol_in_objfile. + +2014-12-11 Doug Evans <xdje42@gmail.com> + * symtab.c (domain_name) <MODULE_DOMAIN>: Add missing case. 2014-12-10 Simon Marchi <simon.marchi@ericsson.com> diff --git a/gdb/symtab.c b/gdb/symtab.c index 483667d..54e4be4 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -80,15 +80,8 @@ struct symbol *lookup_local_symbol (const char *name, enum language language); static struct symbol * - lookup_symbol_in_objfile_symtabs (struct objfile *objfile, - int block_index, const char *name, - const domain_enum domain); - -static -struct symbol *lookup_symbol_via_quick_fns (struct objfile *objfile, - int block_index, - const char *name, - const domain_enum domain); + lookup_symbol_in_objfile (struct objfile *objfile, int block_index, + const char *name, const domain_enum domain); extern initialize_file_ftype _initialize_symtab; @@ -1552,15 +1545,10 @@ lookup_global_symbol_from_objfile (struct objfile *main_objfile, objfile; objfile = objfile_separate_debug_iterate (main_objfile, objfile)) { - struct symbol *sym; - - sym = lookup_symbol_in_objfile_symtabs (objfile, GLOBAL_BLOCK, name, - domain); - if (sym != NULL) - return sym; + struct symbol *sym = lookup_symbol_in_objfile (objfile, GLOBAL_BLOCK, + name, domain); - sym = lookup_symbol_via_quick_fns (objfile, GLOBAL_BLOCK, name, domain); - if (sym) + if (sym != NULL) return sym; } |