Remove ui_out_destroy

[deliverable/binutils-gdb.git] / gdb / ui-file.h

diff --git a/gdb/ui-file.h b/gdb/ui-file.h
index 29ce5e0c961e66a9c51537fdedf16dac6a53cb09..2ed11ded82caf9090e815062a27d222011b6d363 100644 (file)
--- a/gdb/ui-file.h
+++ b/gdb/ui-file.h
@@ -1,5 +1,5 @@
 /* UI_FILE - a generic STDIO like output stream.
-   Copyright (C) 1999-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2016 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -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);
@@ -77,7 +79,7 @@ extern void set_ui_file_put (struct ui_file *stream, ui_file_put_ftype *put);
 
 typedef void (ui_file_delete_ftype) (struct ui_file * stream);
 extern void set_ui_file_data (struct ui_file *stream, void *data,
-                             ui_file_delete_ftype *delete);
+                             ui_file_delete_ftype *to_delete);
 
 typedef int (ui_file_fseek_ftype) (struct ui_file *stream, long offset,
                                   int whence);
@@ -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,
@@ -135,8 +141,8 @@ extern struct ui_file *mem_fileopen (void);
 /* Open/create a STDIO based UI_FILE using the already open FILE.  */
 extern struct ui_file *stdio_fileopen (FILE *file);
 
-/* Create a ui_file from stderr.  */
-extern struct ui_file *stderr_fileopen (void);
+/* Likewise, for stderr-like streams.  */
+extern struct ui_file *stderr_fileopen (FILE *file);
 
 
 /* Open NAME returning an STDIO based UI_FILE.  */