@@ -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);
@@ -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)
@@ -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);
@@ -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);
@@ -1750,7 +1750,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. */
@@ -1830,7 +1830,7 @@ lookup_static_symbol (const char *name, const domain_enum domain)
/* 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)
{
@@ -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 *);