From 7b01d34b2a62fb8cda96fe40c755f99e63b8ba4f Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 8 Nov 2016 15:26:45 +0000 Subject: [PATCH] Use ui_file_as_string in gdb/top.c Yet another cleanup is eliminated. gdb/ChangeLog: 2016-11-08 Pedro Alves * top.c (quit_confirm): Use ui_file_as_string and std::string. --- gdb/ChangeLog | 4 ++++ gdb/top.c | 9 +++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 68f8cf0d49..08699ed10e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2016-11-08 Pedro Alves + + * top.c (quit_confirm): Use ui_file_as_string and std::string. + 2016-11-08 Pedro Alves * gdbcmd.h (execute_command_to_string): Now returns std::string. diff --git a/gdb/top.c b/gdb/top.c index 504a4dede1..7d8b6e8cbb 100644 --- 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 -- 2.34.1