aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cagney <cagney@redhat.com>2003-05-15 22:23:24 +0000
committerAndrew Cagney <cagney@redhat.com>2003-05-15 22:23:24 +0000
commite06963ffef465de9702443d1f3e04b7d34fa5616 (patch)
treef22750dc6f631587889bbe9cd9c25476e592dcbe
parent973177d3c5d517f8de4b4f1b7a4a75c9e5936375 (diff)
downloadgdb-e06963ffef465de9702443d1f3e04b7d34fa5616.zip
gdb-e06963ffef465de9702443d1f3e04b7d34fa5616.tar.gz
gdb-e06963ffef465de9702443d1f3e04b7d34fa5616.tar.bz2
2003-05-15 Andrew Cagney <cagney@redhat.com>
* symtab.h (DEPRECATED_SYMBOL_MATCHES_NAME): Delete macro. * minsyms.c (lookup_minimal_symbol): Inline DEPRECATED_SYMBOL_MATCHES_NAME. Replace STREQ with strcmp.
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/minsyms.c10
-rw-r--r--gdb/symtab.h10
3 files changed, 13 insertions, 11 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5e4706f..5802390 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2003-05-15 Andrew Cagney <cagney@redhat.com>
+ * symtab.h (DEPRECATED_SYMBOL_MATCHES_NAME): Delete macro.
+ * minsyms.c (lookup_minimal_symbol): Inline
+ DEPRECATED_SYMBOL_MATCHES_NAME. Replace STREQ with strcmp.
+
* c-lang.c (c_printstr): Delete "extern inspect_it" declaration.
* p-valprint.c (pascal_object_print_value_fields): Ditto.
* p-lang.c (pascal_printstr): Ditto.
diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index 1f6cb38..fa7209d 100644
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -189,7 +189,15 @@ lookup_minimal_symbol (register const char *name, const char *sfile,
while (msymbol != NULL && found_symbol == NULL)
{
- if (DEPRECATED_SYMBOL_MATCHES_NAME (msymbol, name))
+ /* FIXME: carlton/2003-02-27: This is an unholy
+ mixture of linkage names and natural names. If
+ you want to test the linkage names with strcmp,
+ do that. If you want to test the natural names
+ with strcmp_iw, use SYMBOL_MATCHES_NATURAL_NAME. */
+ if (strcmp (DEPRECATED_SYMBOL_NAME (msymbol), (name)) == 0
+ || (SYMBOL_DEMANGLED_NAME (msymbol) != NULL
+ && strcmp_iw (SYMBOL_DEMANGLED_NAME (msymbol),
+ (name)) == 0))
{
switch (MSYMBOL_TYPE (msymbol))
{
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 000ae0e..f8be03b 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -219,16 +219,6 @@ extern char *symbol_demangled_name (struct general_symbol_info *symbol);
"foo :: bar (int, long)".
Evaluates to zero if the match fails, or nonzero if it succeeds. */
-/* FIXME: carlton/2003-02-27: This is an unholy mixture of linkage
- names and natural names. If you want to test the linkage names
- with strcmp, do that. If you want to test the natural names with
- strcmp_iw, use SYMBOL_MATCHES_NATURAL_NAME. */
-
-#define DEPRECATED_SYMBOL_MATCHES_NAME(symbol, name) \
- (STREQ (DEPRECATED_SYMBOL_NAME (symbol), (name)) \
- || (SYMBOL_DEMANGLED_NAME (symbol) != NULL \
- && strcmp_iw (SYMBOL_DEMANGLED_NAME (symbol), (name)) == 0))
-
/* Macro that tests a symbol for a match against a specified name
string. It tests against SYMBOL_NATURAL_NAME, and it ignores
whitespace and trailing parentheses. (See strcmp_iw for details