Use ui_file_as_string in gdb/top.c

Yet another cleanup is eliminated.

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

	* top.c (quit_confirm): Use ui_file_as_string and std::string.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 68f8cf0d494e3a6a181c6aabbf9946066374da53..08699ed10eed33994a1a97f32f0565c8cfb5d6be 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2016-11-08  Pedro Alves  <palves@redhat.com>
+
+       * top.c (quit_confirm): Use ui_file_as_string and std::string.
+
 2016-11-08  Pedro Alves  <palves@redhat.com>
 
        * gdbcmd.h (execute_command_to_string): Now returns std::string.

diff --git a/gdb/top.c b/gdb/top.c
index 504a4dede1230bfd3e49ba93963ea4d608b6cbf0..7d8b6e8cbb1718a855fc9052fd9dc1f447306088 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -1576,8 +1576,6 @@ quit_confirm (void)
 {
   struct ui_file *stb;
   struct cleanup *old_chain;
-  char *str;
-  int qr;
 
   /* Don't even ask if we're only debugging a core file inferior.  */
   if (!have_live_inferiors ())
@@ -1591,12 +1589,11 @@ quit_confirm (void)
   iterate_over_inferiors (print_inferior_quit_action, stb);
   fprintf_filtered (stb, _("\nQuit anyway? "));
 
-  str = ui_file_xstrdup (stb, NULL);
-  make_cleanup (xfree, str);
+  std::string str = ui_file_as_string (stb);
 
-  qr = query ("%s", str);
   do_cleanups (old_chain);
-  return qr;
+
+  return query ("%s", str.c_str ());
 }
 
 /* Prepare to exit GDB cleanly by undoing any changes made to the