Commit: 7b01d34b2a62fb8cda96fe40c755f99e63b8ba4f - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• Révision: 7b01d34b2a62fb8cda96fe40c755f99e63b8ba4f (tree)
• l'heure: 2016-11-09 00:26:45
• Auteur: Pedro Alves <palves@redh...>
• Commiter: Pedro Alves

Message de Log

Use ui_file_as_string in gdb/top.c

Yet another cleanup is eliminated.

gdb/ChangeLog:
2016-11-08 Pedro Alves <[e-mail]>

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

Change Summary

• modified: gdb/ChangeLog
• modified: gdb/top.c

Modification

--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2016-11-08  Pedro Alves  <[e-mail]>
 
+	* top.c (quit_confirm): Use ui_file_as_string and std::string.
+
[phone]  Pedro Alves  <[e-mail]>
+
 	* gdbcmd.h (execute_command_to_string): Now returns std::string.
 	(lookup_struct_elt_type): Adjust to use std::string.
 	* top.c (execute_command_to_string): Use ui_file_as_string and

--- 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