This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[rfa] Inline/eliminate DEPRECATED_SYMBOL_MATCHES_NAME
- From: Andrew Cagney <ac131313 at redhat dot com>
- To: gdb-patches at sources dot redhat dot com
- Date: Thu, 15 May 2003 14:22:01 -0400
- Subject: [rfa] Inline/eliminate DEPRECATED_SYMBOL_MATCHES_NAME
This patch replaces the only remaining reference to
DEPRECATED_SYMBOL_MATCHES_NAME with it's contents (which also contains a
reference to a deprecated macro).
ok?
Andrew
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.
Index: minsyms.c
===================================================================
RCS file: /cvs/src/src/gdb/minsyms.c,v
retrieving revision 1.30
diff -u -r1.30 minsyms.c
--- minsyms.c 13 Apr 2003 15:25:23 -0000 1.30
+++ minsyms.c 15 May 2003 18:16:03 -0000
@@ -189,7 +189,15 @@
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))
{
Index: symtab.h
===================================================================
RCS file: /cvs/src/src/gdb/symtab.h,v
retrieving revision 1.70
diff -u -r1.70 symtab.h
--- symtab.h 14 May 2003 17:43:20 -0000 1.70
+++ symtab.h 15 May 2003 18:16:04 -0000
@@ -219,16 +219,6 @@
"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