diff options
author | Pedro Alves <palves@redhat.com> | 2016-11-08 15:26:43 +0000 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2016-11-08 15:26:43 +0000 |
commit | 8de00631b8bd1c328f1916b1fd95bd0d9ff2017e (patch) | |
tree | 066db27e19c10df5ed993039a210bf9c8ebc1bae /gdb/ui-file.c | |
parent | 4d01a485d29732b19743e8b138897f3509e071b0 (diff) | |
download | gdb-8de00631b8bd1c328f1916b1fd95bd0d9ff2017e.zip gdb-8de00631b8bd1c328f1916b1fd95bd0d9ff2017e.tar.gz gdb-8de00631b8bd1c328f1916b1fd95bd0d9ff2017e.tar.bz2 |
Introduce ui_file_as_string
ui_file_as_string is a variant of ui_file_xstrdup that returns a
std::string instead of a xmalloc'ed char *. The idea is using the new
function to eliminate "make_cleanup (xfree, ...)" cleanups
throughout.
Following patches will make use of this.
gdb/ChangeLog:
2016-11-08 Pedro Alves <palves@redhat.com>
* ui-file.c (do_ui_file_as_string, ui_file_as_string): New
functions.
* ui-file.h: Include <string>.
(ui_file_as_string): New declaration.
Diffstat (limited to 'gdb/ui-file.c')
-rw-r--r-- | gdb/ui-file.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/gdb/ui-file.c b/gdb/ui-file.c index a977f89..31228a3 100644 --- a/gdb/ui-file.c +++ b/gdb/ui-file.c @@ -356,6 +356,28 @@ ui_file_xstrdup (struct ui_file *file, long *length) return acc.buffer; } +/* ui_file utility function for converting a ``struct ui_file'' into a + std:string. */ + +static void +do_ui_file_as_string (void *context, const char *buffer, long length) +{ + std::string *str = (std::string *) context; + + *str = std::string (buffer, length); +} + +/* See ui-file.h. */ + +std::string +ui_file_as_string (struct ui_file *file) +{ + std::string str; + + ui_file_put (file, do_ui_file_as_string, &str); + return str; +} + static void do_ui_file_obsavestring (void *context, const char *buffer, long length) { |