Use ui_file_as_string in gdb/cli/cli-setshow.c

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

	* cli/cli-setshow.c (do_show_command): Adjust to use
	ui_file_as_string and std::string.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 51a1206..ae21b12 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2016-11-08  Pedro Alves  <palves@redhat.com>
 
+       * cli/cli-setshow.c (do_show_command): Adjust to use
+       ui_file_as_string and std::string.
+
+2016-11-08  Pedro Alves  <palves@redhat.com>
+
        * remote.c (escape_buffer): Use ui_file_as_string and return
        std::string.
        (putpkt_binary, read_frame): Adjust to use std::string.

diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index eb17158..d2ec1df 100644 (file)
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -653,13 +653,12 @@ do_show_command (const char *arg, int from_tty, struct cmd_list_element *c)
     ui_out_field_stream (uiout, "value", stb);
   else
     {
-      char *value = ui_file_xstrdup (stb, NULL);
+      std::string value = ui_file_as_string (stb);
 
-      make_cleanup (xfree, value);
       if (c->show_value_func != NULL)
-       c->show_value_func (gdb_stdout, from_tty, c, value);
+       c->show_value_func (gdb_stdout, from_tty, c, value.c_str ());
       else
-       deprecated_show_value_hack (gdb_stdout, from_tty, c, value);
+       deprecated_show_value_hack (gdb_stdout, from_tty, c, value.c_str ());
     }
   do_cleanups (old_chain);