* hppa.h (pa_opcodes): Use "cX" completer instead of "cx" in fstqx

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

diff --git a/gdb/jv-typeprint.c b/gdb/jv-typeprint.c
index 0189ecf..6d8ecdf 100644 (file)
--- a/gdb/jv-typeprint.c
+++ b/gdb/jv-typeprint.c
@@ -1,6 +1,5 @@
 /* Support for printing Java types for GDB, the GNU debugger.
-   Copyright (C) 1997, 1998, 1999, 2000, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 1997-2000, 2007-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -23,6 +22,7 @@
 #include "gdbtypes.h"
 #include "value.h"
 #include "demangle.h"
+#include "gdb-demangle.h"
 #include "jv-lang.h"
 #include "gdb_string.h"
 #include "typeprint.h"
@@ -39,7 +39,7 @@ static void java_type_print_base (struct type * type,
 static void
 java_type_print_derivation_info (struct ui_file *stream, struct type *type)
 {
-  char *name;
+  const char *name;
   int i;
   int n_bases;
   int prev;
@@ -171,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;
 
@@ -197,19 +197,19 @@ 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++)
            {
              struct fn_field *f;
              int j;
-             char *method_name;
-             char *name;
+             const char *method_name;
+             const char *name;
              int is_constructor;
              int n_overloads;
 
@@ -221,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);
@@ -328,9 +329,6 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
 
 /* LEVEL is the depth to indent lines by.  */
 
-extern void c_type_print_varspec_suffix (struct type *, struct ui_file *,
-                                        int, int, int);
-
 void
 java_print_type (struct type *type, const char *varstring,
                 struct ui_file *stream, int show, int level)
@@ -346,7 +344,7 @@ java_print_type (struct type *type, const char *varstring,
     }
 
   /* 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);