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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 67c0b07ea3925385bb25a8feadc94e732c5aa5ce..607808119e436367cf99a3624e6e2589ae3b5e9d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+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.

diff --git a/gdb/ui-file.c b/gdb/ui-file.c
index a977f894ef37ad2866645aa6f701ccbd49a50293..31228a301dd56d1aa115d120aede918cb230a6a5 100644 (file)
--- 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 f6df57265ae34c885dfe6a52a0eb23d3cc4621eb..2ed11ded82caf9090e815062a27d222011b6d363 100644 (file)
--- 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,