2010-04-12 Matthew Gretton-Dann <matthew.gretton-dann@arm.com>

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

diff --git a/gdb/language.c b/gdb/language.c
index c1c0bcf817d1fd9600910749a54c25b258f6961b..dcd70b09147c10a5959a06ec9d28e10383d93eb4 100644 (file)
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -1,7 +1,8 @@
 /* Multiple source language support for GDB.
 
    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010
+   Free Software Foundation, Inc.
 
    Contributed by the Department of Computer Science at the State University
    of New York at Buffalo.
@@ -696,6 +697,7 @@ float_type (struct type *type)
   CHECK_TYPEDEF (type);
   return TYPE_CODE (type) == TYPE_CODE_FLT;
 }
+#endif
 
 /* Returns non-zero if the value is a pointer type */
 int
@@ -705,6 +707,7 @@ pointer_type (struct type *type)
     TYPE_CODE (type) == TYPE_CODE_REF;
 }
 
+#if 0
 /* Returns non-zero if the value is a structured type */
 int
 structured_type (struct type *type)
@@ -884,11 +887,10 @@ add_language (const struct language_defn *lang)
   /* For the "set language" command.  */
   static char **language_names = NULL;
   /* For the "help set language" command.  */
-  static char *language_set_doc = NULL;
+  char *language_set_doc = NULL;
 
   int i;
   struct ui_file *tmp_stream;
-  long len;
 
   if (lang->la_magic != LANG_MAGIC)
     {
@@ -944,8 +946,7 @@ local or auto    Automatic setting based on source file\n"));
                          languages[i]->la_name + 1);
     }
 
-  xfree (language_set_doc);
-  language_set_doc = ui_file_xstrdup (tmp_stream, &len);
+  language_set_doc = ui_file_xstrdup (tmp_stream, NULL);
   ui_file_delete (tmp_stream);
 
   add_setshow_enum_cmd ("language", class_support,
@@ -956,6 +957,8 @@ Show the current source language."), NULL,
                        set_language_command,
                        show_language_command,
                        &setlist, &showlist);
+
+  xfree (language_set_doc);
 }
 
 /* Iterate through all registered languages looking for and calling
@@ -1045,7 +1048,7 @@ default_print_array_index (struct value *index_value, struct ui_file *stream,
 
 void
 default_get_string (struct value *value, gdb_byte **buffer, int *length,
-                   const char **charset)
+                   struct type **char_type, const char **charset)
 {
   error (_("Getting a string is unsupported in this language."));
 }
@@ -1080,7 +1083,7 @@ unk_lang_printchar (int c, struct type *type, struct ui_file *stream)
 static void
 unk_lang_printstr (struct ui_file *stream, struct type *type,
                   const gdb_byte *string, unsigned int length,
-                  int force_ellipses,
+                  const char *encoding, int force_ellipses,
                   const struct value_print_options *options)
 {
   error (_("internal error - unimplemented function unk_lang_printstr called."));