From: Pedro Alves <palves@redhat.com>
Date: Tue, 8 Nov 2016 15:26:45 +0000 (+0000)
Subject: Use ui_file_as_string in gdb/cli/cli-setshow.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d8b0d9483f6eabc2c1739ac3dd64c30061a6a72;p=binutils-gdb.git

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 51a12069611..ae21b12d337 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index eb17158dcb9..d2ec1dfb33d 100644
--- 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);