From: Doug Evans <xdje42@gmail.com>
Date: Thu, 11 Dec 2014 17:55:29 +0000 (-0800)
Subject: (lookup_global_symbol_from_objfile): Simplify.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fe2a438d598329ed45cd7552565085068883276e;p=binutils-gdb.git

(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.
---

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  <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.
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;
     }