gdb/

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

diff --git a/gdb/jv-typeprint.c b/gdb/jv-typeprint.c
index 884bc1270462b8a750603edb68d46a65bcb3d17b..893082cc187ebb9e7498024cc670c2bad7c60768 100644 (file)
--- a/gdb/jv-typeprint.c
+++ b/gdb/jv-typeprint.c
@@ -1,5 +1,5 @@
 /* Support for printing Java types for GDB, the GNU debugger.
-   Copyright 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -28,15 +28,16 @@
 #include "gdb_string.h"
 #include "typeprint.h"
 #include "c-lang.h"
+#include "cp-abi.h"
 
 /* Local functions */
 
-static void java_type_print_base PARAMS ((struct type * type, GDB_FILE * stream, int show, int level));
+static void java_type_print_base (struct type * type,
+                                 struct ui_file *stream, int show,
+                                 int level);
 
 static void
-java_type_print_derivation_info (stream, type)
-     GDB_FILE *stream;
-     struct type *type;
+java_type_print_derivation_info (struct ui_file *stream, struct type *type)
 {
   char *name;
   int i;
@@ -82,11 +83,8 @@ java_type_print_derivation_info (stream, type)
    We increase it for some recursive calls.  */
 
 static void
-java_type_print_base (type, stream, show, level)
-     struct type *type;
-     GDB_FILE *stream;
-     int show;
-     int level;
+java_type_print_base (struct type *type, struct ui_file *stream, int show,
+                     int level)
 {
   register int i;
   register int len;
@@ -125,7 +123,7 @@ java_type_print_base (type, stream, show, level)
        {                       /* array type */
          char *name = java_demangle_type_signature (TYPE_TAG_NAME (type));
          fputs_filtered (name, stream);
-         free (name);
+         xfree (name);
          break;
        }
 
@@ -154,7 +152,7 @@ java_type_print_base (type, stream, show, level)
          fprintf_filtered (stream, "{\n");
          if ((TYPE_NFIELDS (type) == 0) && (TYPE_NFN_FIELDS (type) == 0))
            {
-             if (TYPE_FLAGS (type) & TYPE_FLAG_STUB)
+             if (TYPE_STUB (type))
                fprintfi_filtered (level + 4, stream, "<incomplete type>\n");
              else
                fprintfi_filtered (level + 4, stream, "<no data fields>\n");
@@ -227,12 +225,9 @@ java_type_print_base (type, stream, show, level)
 
                  physname = TYPE_FN_FIELD_PHYSNAME (f, j);
 
-                 is_full_physname_constructor =
-                   ((physname[0] == '_' && physname[1] == '_'
-                     && strchr ("0123456789Qt", physname[2]))
-                    || STREQN (physname, "__ct__", 6)
-                    || DESTRUCTOR_PREFIX_P (physname)
-                    || STREQN (physname, "__dt__", 6));
+                 is_full_physname_constructor
+                    = (is_constructor_name (physname)
+                       || is_destructor_name (physname));
 
                  QUIT;
 
@@ -281,7 +276,7 @@ java_type_print_base (type, stream, show, level)
                                    DMGL_ANSI | DMGL_PARAMS | DMGL_JAVA);
 
                  if (demangled_name == NULL)
-                   demangled_name = strdup (mangled_name);
+                   demangled_name = xstrdup (mangled_name);
 
                  {
                    char *demangled_no_class;
@@ -302,11 +297,11 @@ java_type_print_base (type, stream, show, level)
                      }
 
                    fputs_filtered (demangled_no_class, stream);
-                   free (demangled_name);
+                   xfree (demangled_name);
                  }
 
                  if (TYPE_FN_FIELD_STUB (f, j))
-                   free (mangled_name);
+                   xfree (mangled_name);
 
                  fprintf_filtered (stream, ";\n");
                }
@@ -323,16 +318,12 @@ java_type_print_base (type, stream, show, level)
 
 /* LEVEL is the depth to indent lines by.  */
 
-extern void
-c_type_print_varspec_suffix PARAMS ((struct type *, GDB_FILE *, int, int, int));
+extern void c_type_print_varspec_suffix (struct type *, struct ui_file *,
+                                        int, int, int);
 
 void
-java_print_type (type, varstring, stream, show, level)
-     struct type *type;
-     char *varstring;
-     GDB_FILE *stream;
-     int show;
-     int level;
+java_print_type (struct type *type, char *varstring, struct ui_file *stream,
+                int show, int level)
 {
   int demangled_args;