aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2016-11-08 15:26:44 +0000
committerPedro Alves <palves@redhat.com>2016-11-08 15:26:44 +0000
commitd16c5475b560adbad2d9bc78ec3718658f4090e3 (patch)
tree60b9ef55ead8b5875e305cbcf692094ba601057e
parent56dbf31760f721893a44d3da26adfccf548995c7 (diff)
downloadgdb-d16c5475b560adbad2d9bc78ec3718658f4090e3.zip
gdb-d16c5475b560adbad2d9bc78ec3718658f4090e3.tar.gz
gdb-d16c5475b560adbad2d9bc78ec3718658f4090e3.tar.bz2
Use ui_file_as_string in gdb/utils.c
gdb/ChangeLog: 2016-11-08 Pedro Alves <palves@redhat.com> * utils.c (error_stream): Use ui_file_as_string and std::string.
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/utils.c5
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 <palves@redhat.com>
+ * utils.c (error_stream): Use ui_file_as_string and std::string.
+
+2016-11-08 Pedro Alves <palves@redhat.com>
+
* ui-out.c (ui_out_field_stream): Use ui_file_as_string.
2016-11-08 Pedro Alves <palves@redhat.com>
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. */