* gdb.threads/thread-find.exp: Support remote targets.

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

diff --git a/gdb/jv-typeprint.c b/gdb/jv-typeprint.c
index 6132576a4fb8c7ecfdd32e3d254b341f9c68cfb4..8d9ebfd9ccd70cfb9f2871bbac77947cd36a0536 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 (C) 1997, 1998, 1999, 2000, 2007, 2008, 2009, 2010
+   Copyright (C) 1997, 1998, 1999, 2000, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -90,8 +90,8 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
   int len;
   char *mangled_name;
   char *demangled_name;
-  QUIT;
 
+  QUIT;
   wrap_here ("    ");
 
   if (type == NULL)
@@ -122,6 +122,7 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
       if (TYPE_TAG_NAME (type) != NULL && TYPE_TAG_NAME (type)[0] == '[')
        {                       /* array type */
          char *name = java_demangle_type_signature (TYPE_TAG_NAME (type));
+
          fputs_filtered (name, stream);
          xfree (name);
          break;
@@ -170,7 +171,7 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
                  && is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5]))
                continue;
 
-             /* Don't print the dummy field "class". */
+             /* Don't print the dummy field "class".  */
              if (strncmp (TYPE_FIELD_NAME (type, i), "class", 5) == 0)
                continue;
 
@@ -196,12 +197,12 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
              fprintf_filtered (stream, ";\n");
            }
 
-         /* If there are both fields and methods, put a space between. */
+         /* If there are both fields and methods, put a space between.  */
          len = TYPE_NFN_FIELDS (type);
          if (len)
            fprintf_filtered (stream, "\n");
 
-         /* Print out the methods */
+         /* Print out the methods.  */
 
          for (i = 0; i < len; i++)
            {
@@ -220,7 +221,8 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
 
              for (j = 0; j < n_overloads; j++)
                {
-                 char *real_physname, *physname, *p;
+                 const char *real_physname;
+                 char *physname, *p;
                  int is_full_physname_constructor;
 
                  real_physname = TYPE_FN_FIELD_PHYSNAME (f, j);
@@ -331,8 +333,8 @@ extern void c_type_print_varspec_suffix (struct type *, struct ui_file *,
                                         int, int, int);
 
 void
-java_print_type (struct type *type, char *varstring, struct ui_file *stream,
-                int show, int level)
+java_print_type (struct type *type, const char *varstring,
+                struct ui_file *stream, int show, int level)
 {
   int demangled_args;
 
@@ -345,7 +347,7 @@ java_print_type (struct type *type, char *varstring, struct ui_file *stream,
     }
 
   /* For demangled function names, we have the arglist as part of the name,
-     so don't print an additional pair of ()'s */
+     so don't print an additional pair of ()'s.  */
 
   demangled_args = varstring != NULL && strchr (varstring, '(') != NULL;
   c_type_print_varspec_suffix (type, stream, show, 0, demangled_args);