From fe2a438d598329ed45cd7552565085068883276e Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Thu, 11 Dec 2014 09:55:29 -0800 Subject: [PATCH] (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. --- gdb/ChangeLog | 8 ++++++++ gdb/symtab.c | 22 +++++----------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e4e32ff1d46..f5f80180fdb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2014-12-11 Doug Evans + + * 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 * symtab.c (domain_name) : Add missing case. diff --git a/gdb/symtab.c b/gdb/symtab.c index 483667da1b5..54e4be45782 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; } -- 2.30.2