From c8be89511da02d0e6b1c1ed244575217d7716e10 Mon Sep 17 00:00:00 2001 From: David Carlton Date: Thu, 27 Feb 2003 20:48:03 +0000 Subject: [PATCH] 2003-02-27 David Carlton * symfile.c (compare_symbols): Use SYMBOL_NATURAL_NAME, not SYMBOL_PRINT_NAME. (compare_psymbols): Ditto. * symtab.c (lookup_partial_symbol, lookup_block_symbol): Ditto. --- gdb/ChangeLog | 7 +++++++ gdb/symfile.c | 6 +++--- gdb/symtab.c | 8 ++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c4d9d793908..cc9b50c652d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2003-02-27 David Carlton + + * symfile.c (compare_symbols): Use SYMBOL_NATURAL_NAME, not + SYMBOL_PRINT_NAME. + (compare_psymbols): Ditto. + * symtab.c (lookup_partial_symbol, lookup_block_symbol): Ditto. + 2003-02-27 Michael Snyder * f-lang.c (build_fortran_types): New function. diff --git a/gdb/symfile.c b/gdb/symfile.c index 3b88c2f4c3b..8380b276019 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -210,7 +210,7 @@ compare_symbols (const void *s1p, const void *s2p) s1 = (struct symbol **) s1p; s2 = (struct symbol **) s2p; - return (strcmp (SYMBOL_PRINT_NAME (*s1), SYMBOL_PRINT_NAME (*s2))); + return (strcmp (SYMBOL_NATURAL_NAME (*s1), SYMBOL_NATURAL_NAME (*s2))); } /* This compares two partial symbols by names, using strcmp_iw_ordered @@ -222,8 +222,8 @@ compare_psymbols (const void *s1p, const void *s2p) struct partial_symbol *const *s1 = s1p; struct partial_symbol *const *s2 = s2p; - return strcmp_iw_ordered (SYMBOL_PRINT_NAME (*s1), - SYMBOL_PRINT_NAME (*s2)); + return strcmp_iw_ordered (SYMBOL_NATURAL_NAME (*s1), + SYMBOL_NATURAL_NAME (*s2)); } void diff --git a/gdb/symtab.c b/gdb/symtab.c index c9541fa8856..f3f55e12d16 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -1411,7 +1411,7 @@ lookup_partial_symbol (struct partial_symtab *pst, const char *name, int global, { do_linear_search = 1; } - if (strcmp_iw_ordered (SYMBOL_PRINT_NAME (*center), name) >= 0) + if (strcmp_iw_ordered (SYMBOL_NATURAL_NAME (*center), name) >= 0) { top = center; } @@ -1657,15 +1657,15 @@ lookup_block_symbol (register const struct block *block, const char *name, { do_linear_search = 1; } - if (SYMBOL_PRINT_NAME (sym)[0] < name[0]) + if (SYMBOL_NATURAL_NAME (sym)[0] < name[0]) { bot = inc; } - else if (SYMBOL_PRINT_NAME (sym)[0] > name[0]) + else if (SYMBOL_NATURAL_NAME (sym)[0] > name[0]) { top = inc; } - else if (strcmp (SYMBOL_PRINT_NAME (sym), name) < 0) + else if (strcmp (SYMBOL_NATURAL_NAME (sym), name) < 0) { bot = inc; } -- 2.30.2