Use ui_file_as_string in gdb/language.c

gdb/ChangeLog:
2016-11-08  Pedro Alves  <palves@redhat.com>

	* language.c (add_language): Use ui_file_as_string and adjust to
	use std::string.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 883114f..ed6f160 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,4 +1,9 @@
 2016-11-08  Pedro Alves  <palves@redhat.com>
+
+       * language.c (add_language): Use ui_file_as_string and adjust to
+       use std::string.
+
+2016-11-08  Pedro Alves  <palves@redhat.com>
            Tom Tromey  <tom@tromey.com>
 
        * rust-lang.c (struct disr_info) <name>: Now a std::string.

diff --git a/gdb/language.c b/gdb/language.c
index 39faecc..2869d75 100644 (file)
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -538,7 +538,6 @@ add_language (const struct language_defn *lang)
   /* For the "set language" command.  */
   static const char **language_names = NULL;
   /* For the "help set language" command.  */
-  char *language_set_doc = NULL;
 
   int i;
   struct ui_file *tmp_stream;
@@ -609,19 +608,17 @@ add_language (const struct language_defn *lang)
                          languages[i]->la_name + 1);
     }
 
-  language_set_doc = ui_file_xstrdup (tmp_stream, NULL);
+  std::string language_set_doc = ui_file_as_string (tmp_stream);
   ui_file_delete (tmp_stream);
 
   add_setshow_enum_cmd ("language", class_support,
                        (const char **) language_names,
                        &language,
-                       language_set_doc,
+                       language_set_doc.c_str (),
                        _("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