From d16c5475b560adbad2d9bc78ec3718658f4090e3 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 8 Nov 2016 15:26:44 +0000 Subject: [PATCH] Use ui_file_as_string in gdb/utils.c gdb/ChangeLog: 2016-11-08 Pedro Alves * utils.c (error_stream): Use ui_file_as_string and std::string. --- gdb/ChangeLog | 4 ++++ gdb/utils.c | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7855776..769187f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2016-11-08 Pedro Alves + * utils.c (error_stream): Use ui_file_as_string and std::string. + +2016-11-08 Pedro Alves + * ui-out.c (ui_out_field_stream): Use ui_file_as_string. 2016-11-08 Pedro Alves diff --git a/gdb/utils.c b/gdb/utils.c index c7ba051..751f099 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -480,10 +480,9 @@ verror (const char *string, va_list args) void error_stream (struct ui_file *stream) { - char *message = ui_file_xstrdup (stream, NULL); + std::string message = ui_file_as_string (stream); - make_cleanup (xfree, message); - error (("%s"), message); + error (("%s"), message.c_str ()); } /* Emit a message and abort. */ -- 2.7.4