2003-02-27 David Carlton <carlton@math.stanford.edu>

	* symfile.c (compare_symbols): Use SYMBOL_NATURAL_NAME, not
	SYMBOL_PRINT_NAME.
	(compare_psymbols): Ditto.
	* symtab.c (lookup_partial_symbol, lookup_block_symbol): Ditto.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c4d9d793908b809e833d504e4a29862eaca9ec07..cc9b50c652de49b6f69f080f2f1e64b7e952b414 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-27  David Carlton  <carlton@math.stanford.edu>
+
+       * 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  <msnyder@redhat.com>
 
        * f-lang.c (build_fortran_types): New function.

diff --git a/gdb/symfile.c b/gdb/symfile.c
index 3b88c2f4c3b79841b29528f8b55c588b418378c5..8380b2760196670449e9fc55a83e505dfca0f010 100644 (file)
--- 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 c9541fa8856379d7eb61527454657da807e425b6..f3f55e12d164bdcfd3b4192ddb1ecd9eff3708b5 100644 (file)
--- 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;
            }