* breakpoint.c, breakpoint.h (breakpoint_init_inferior): New function

[deliverable/binutils-gdb.git] / gdb / c-typeprint.c

diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index 31cb0c4eea74d40b7c164d1a48bf3a73ec2ad1c7..fa4035b00ac872762c2cf19db9cbf789c2a92706 100644 (file)
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -306,6 +306,7 @@ c_type_print_varspec_prefix (type, stream, show, passed_a_ptr)
     case TYPE_CODE_SET:
     case TYPE_CODE_RANGE:
     case TYPE_CODE_STRING:
+    case TYPE_CODE_BITSTRING:
       /* These types need no prefix.  They are listed here so that
         gcc -Wall will reveal any types that haven't been handled.  */
       break;
@@ -429,6 +430,7 @@ c_type_print_varspec_suffix (type, stream, show, passed_a_ptr, demangled_args)
     case TYPE_CODE_SET:
     case TYPE_CODE_RANGE:
     case TYPE_CODE_STRING:
+    case TYPE_CODE_BITSTRING:
       /* These types do not need a suffix.  They are listed so that
         gcc -Wall will report types that may not have been considered.  */
       break;
@@ -678,15 +680,24 @@ c_type_print_base (type, stream, show, level)
                      /* Build something we can demangle.  */
                      mangled_name = gdb_mangle_name (type, i, j);
                      demangled_name =
-                         cplus_demangle (mangled_name,
-                                         DMGL_ANSI | DMGL_PARAMS);
+                       cplus_demangle (mangled_name,
+                                       DMGL_ANSI | DMGL_PARAMS);
                      if (demangled_name == NULL)
                        fprintf_filtered (stream, "<badly mangled name %s>",
-                           mangled_name);
-                     else 
+                                         mangled_name);
+                     else
                        {
-                         fprintf_filtered (stream, "%s",
-                             strchr (demangled_name, ':') + 2);
+                         char *demangled_no_class =
+                           strchr (demangled_name, ':');
+
+                         if (demangled_no_class == NULL)
+                           demangled_no_class = demangled_name;
+                         else
+                           {
+                             if (*++demangled_no_class == ':')
+                               ++demangled_no_class;
+                           }
+                         fputs_filtered (demangled_no_class, stream);
                          free (demangled_name);
                        }
                      free (mangled_name);