Rename lookup_symbol_global to lookup_global_symbol.

gdb/ChangeLog:

	* symtab.c (lookup_global_symbol): Renamed from lookup_symbol_global.
	All callers updated.
	* symtab.h (lookup_global_symbol): Update decl.
	(lookup_static_symbol): Move decl to better location.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 882262d7390fdcb5fe0b5fed45688757e6954a6d..42ecfc4b5f6e8efc56d00bca68eea517607ab8f5 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-06  Doug Evans  <xdje42@gmail.com>
+
+       * symtab.c (lookup_global_symbol): Renamed from lookup_symbol_global.
+       All callers updated.
+       * symtab.h (lookup_global_symbol): Update decl.
+       (lookup_static_symbol): Move decl to better location.
+
 2014-11-06  Doug Evans  <xdje42@gmail.com>
 
        * symtab.c (basic_lookup_symbol_nonlocal): Add comment.

diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index 898fb5a7d9c3620a3ab31a663c631b05a475ad2d..4366666e325dc05673ef537491dcc2cf8e43e154 100644 (file)
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -632,7 +632,7 @@ lookup_symbol_file (const char *name,
     }
   else
     {
-      sym = lookup_symbol_global (name, block, domain);
+      sym = lookup_global_symbol (name, block, domain);
     }
 
   if (sym != NULL)
@@ -692,7 +692,7 @@ lookup_symbol_file (const char *name,
 
       /* Lookup a class named KLASS.  If none is found, there is nothing
         more that can be done.  */
-      klass_sym = lookup_symbol_global (klass, block, domain);
+      klass_sym = lookup_global_symbol (klass, block, domain);
       if (klass_sym == NULL)
        {
          do_cleanups (cleanup);

diff --git a/gdb/d-exp.y b/gdb/d-exp.y
index e0df9bc479b42bdffa02858c1aadd455b478a441..5e4c10dfe70cf6c4e96d53a1ad78fdcad22a905c 100644 (file)
--- a/gdb/d-exp.y
+++ b/gdb/d-exp.y
@@ -1182,7 +1182,7 @@ push_module_name (struct parser_state *ps, struct type *module,
       sym = lookup_symbol_in_static_block (copy, expression_context_block,
                                           VAR_DOMAIN);
       if (sym != NULL)
-       sym = lookup_symbol_global (copy, expression_context_block,
+       sym = lookup_global_symbol (copy, expression_context_block,
                                    VAR_DOMAIN);
 
       if (sym != NULL)

diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c
index cb7abf34c359cda98c9444051e50e8e4d4635faa..352451bb6777872a80ed1084f794ada7db3f4305 100644 (file)
--- a/gdb/guile/scm-symbol.c
+++ b/gdb/guile/scm-symbol.c
@@ -607,7 +607,7 @@ gdbscm_lookup_global_symbol (SCM name_scm, SCM rest)
 
   TRY_CATCH (except, RETURN_MASK_ALL)
     {
-      symbol = lookup_symbol_global (name, NULL, domain);
+      symbol = lookup_global_symbol (name, NULL, domain);
     }
   do_cleanups (cleanups);
   GDBSCM_HANDLE_GDB_EXCEPTION (except);

diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c
index 5d71c503e57c8db4f51dcc567b070de28862eea1..716f93d893424e5209f0339f8f409e6ed6f71e77 100644 (file)
--- a/gdb/python/py-symbol.c
+++ b/gdb/python/py-symbol.c
@@ -433,7 +433,7 @@ gdbpy_lookup_global_symbol (PyObject *self, PyObject *args, PyObject *kw)
 
   TRY_CATCH (except, RETURN_MASK_ALL)
     {
-      symbol = lookup_symbol_global (name, NULL, domain);
+      symbol = lookup_global_symbol (name, NULL, domain);
     }
   GDB_PY_HANDLE_EXCEPTION (except);
 

diff --git a/gdb/symtab.c b/gdb/symtab.c
index e2a1e56f6608d26b25f9d82b2a7876a69dd25328..2aae04c99db80b77fccb386a4d1642f8317b7db8 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -1800,7 +1800,7 @@ basic_lookup_symbol_nonlocal (const char *name,
   if (sym != NULL)
     return sym;
 
-  return lookup_symbol_global (name, block, domain);
+  return lookup_global_symbol (name, block, domain);
 }
 
 /* See symtab.h.  */
@@ -1861,7 +1861,7 @@ lookup_symbol_global_iterator_cb (struct objfile *objfile,
 /* See symtab.h.  */
 
 struct symbol *
-lookup_symbol_global (const char *name,
+lookup_global_symbol (const char *name,
                      const struct block *block,
                      const domain_enum domain)
 {

diff --git a/gdb/symtab.h b/gdb/symtab.h
index 5564dbe6ccba376db6fc3ed6d838fc24e568c6fc..c967c62e53efff92745a520eb779679bf8025685 100644 (file)
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -1096,11 +1096,18 @@ extern struct symbol *lookup_symbol_in_static_block (const char *name,
                                                     const struct block *block,
                                                     const domain_enum domain);
 
+/* Search all static file-level symbols for NAME from DOMAIN.
+   Upon success sets BLOCK_FOUND and fixes up the symbol's section
+   if necessary.  */
+
+extern struct symbol *lookup_static_symbol (const char *name,
+                                           const domain_enum domain);
+
 /* Lookup a symbol in all files' global blocks.
    Upon success sets BLOCK_FOUND and fixes up the symbol's section
    if necessary.  */
 
-extern struct symbol *lookup_symbol_global (const char *name,
+extern struct symbol *lookup_global_symbol (const char *name,
                                            const struct block *block,
                                            const domain_enum domain);
 
@@ -1118,13 +1125,6 @@ extern struct symbol *lookup_symbol_in_block (const char *name,
 extern struct symbol *lookup_language_this (const struct language_defn *lang,
                                            const struct block *block);
 
-/* Search all static file-level symbols for NAME from DOMAIN.
-   Upon success sets BLOCK_FOUND and fixes up the symbol's section
-   if necessary.  */
-
-extern struct symbol *lookup_static_symbol (const char *name,
-                                           const domain_enum domain);
-
 /* Lookup a [struct, union, enum] by name, within a specified block.  */
 
 extern struct type *lookup_struct (const char *, const struct block *);