From 02030646c2a799614d31e52008403d8be067ac5d 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/printcmd.c Yet another cleanup eliminated. gdb/ChangeLog: 2016-11-08 Pedro Alves * printcmd.c (eval_command): Use ui_file_as_string and std::string. --- gdb/ChangeLog | 5 +++++ gdb/printcmd.c | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 08699ed10ee..254893f94f6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-11-08 Pedro Alves + + * printcmd.c (eval_command): Use ui_file_as_string and + std::string. + 2016-11-08 Pedro Alves * top.c (quit_confirm): Use ui_file_as_string and std::string. diff --git a/gdb/printcmd.c b/gdb/printcmd.c index b70ed19f98b..23de57cb213 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -2719,14 +2719,12 @@ eval_command (char *arg, int from_tty) { struct ui_file *ui_out = mem_fileopen (); struct cleanup *cleanups = make_cleanup_ui_file_delete (ui_out); - char *expanded; ui_printf (arg, ui_out); - expanded = ui_file_xstrdup (ui_out, NULL); - make_cleanup (xfree, expanded); + std::string expanded = ui_file_as_string (ui_out); - execute_command (expanded, from_tty); + execute_command (&expanded[0], from_tty); do_cleanups (cleanups); } -- 2.30.2