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 | |
| 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.
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/ui-file.c | 22 | ||||
| -rw-r--r-- | gdb/ui-file.h | 6 |
3 files changed, 35 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 67c0b07..6078081 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 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. + +2016-11-08 Pedro Alves <palves@redhat.com> + * ada-lang.c (ada_read_renaming_var_value): Use expression_up. (struct ada_catchpoint_location) <excep_cond_expr>: Now an expression_up. 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) { diff --git a/gdb/ui-file.h b/gdb/ui-file.h index f6df572..2ed11de 100644 --- a/gdb/ui-file.h +++ b/gdb/ui-file.h @@ -22,6 +22,8 @@ struct obstack; struct ui_file; +#include <string> + /* Create a generic ui_file object with null methods. */ extern struct ui_file *ui_file_new (void); @@ -117,6 +119,10 @@ extern void ui_file_put (struct ui_file *src, minus that appended NUL. */ extern char *ui_file_xstrdup (struct ui_file *file, long *length); +/* Returns a std::string containing the entire contents of FILE (as + determined by ui_file_put()). */ +extern std::string ui_file_as_string (struct ui_file *file); + /* Similar to ui_file_xstrdup, but return a new string allocated on OBSTACK. */ extern char *ui_file_obsavestring (struct ui_file *file, |