Merge GDB 7.5.1

gdb/ui-out.h

 /* Output generating routines for GDB.
 
    Copyright (C) 1999-2003, 2005, 2007-2012 Free Software Foundation,
    Inc.
 
    Contributed by Cygnus Solutions.
    Written by Fernando Nasser for Cygnus.
 
    This file is part of GDB.
 
@@ skipping 34 matching lines @@
   };
 
 /* flags enum */
 enum ui_flags
   {
     ui_from_tty = 1,
     ui_source_list = 2
   };
 
 
-/* The ui_out stream structure.  */
-/* NOTE: cagney/2000-02-01: The ui_stream object can be subsumed by
-   the more generic ui_file object.  */
-
-struct ui_stream
-  {
-    struct ui_out *uiout;
-    struct ui_file *stream;
-  };
-
-
 /* Prototypes for ui-out API.  */
 
 /* A result is a recursive data structure consisting of lists and
    tuples.  */
 
 enum ui_out_type
   {
     ui_out_type_tuple,
     ui_out_type_list
   };
@@ skipping 39 matching lines @@
 
 /* Output a field containing an address.  */
 
 extern void ui_out_field_core_addr (struct ui_out *uiout, const char *fldname,
                                     struct gdbarch *gdbarch, CORE_ADDR address);
 
 extern void ui_out_field_string (struct ui_out * uiout, const char *fldname,
                                  const char *string);
 
 extern void ui_out_field_stream (struct ui_out *uiout, const char *fldname,
-                                 struct ui_stream *buf);
+                                 struct ui_file *stream);
 
 extern void ui_out_field_fmt (struct ui_out *uiout, const char *fldname,
                               const char *format, ...)
      ATTRIBUTE_PRINTF (3, 4);
 
 extern void ui_out_field_skip (struct ui_out *uiout, const char *fldname);
 
 extern void ui_out_spaces (struct ui_out *uiout, int numspaces);
 
 extern void ui_out_text (struct ui_out *uiout, const char *string);
 
 extern void ui_out_message (struct ui_out *uiout, int verbosity,
                             const char *format, ...)
      ATTRIBUTE_PRINTF (3, 4);
 
-extern struct ui_stream *ui_out_stream_new (struct ui_out *uiout);
-
-extern void ui_out_stream_delete (struct ui_stream *buf);
-
-struct cleanup *make_cleanup_ui_out_stream_delete (struct ui_stream *buf);
-
 extern void ui_out_wrap_hint (struct ui_out *uiout, char *identstring);
 
 extern void ui_out_flush (struct ui_out *uiout);
 
 extern int ui_out_set_flags (struct ui_out *uiout, int mask);
 
 extern int ui_out_clear_flags (struct ui_out *uiout, int mask);
 
 extern int ui_out_get_verblvl (struct ui_out *uiout);
 
 extern int ui_out_test_flags (struct ui_out *uiout, int mask);
 
 extern int ui_out_query_field (struct ui_out *uiout, int colno,
                                int *width, int *alignment, char **col_name);
 
-#if 0
-extern void ui_out_result_begin (struct ui_out *uiout, char *class);
-
-extern void ui_out_result_end (struct ui_out *uiout);
-
-extern void ui_out_info_begin (struct ui_out *uiout, char *class);
-
-extern void ui_out_info_end (struct ui_out *uiout);
-
-extern void ui_out_notify_begin (struct ui_out *uiout, char *class);
-
-extern void ui_out_notify_end (struct ui_out *uiout);
-
-extern void ui_out_error_begin (struct ui_out *uiout, char *class);
-
-extern void ui_out_error_end (struct ui_out *uiout);
-#endif
-
-#if 0
-extern void gdb_error (struct ui_out *uiout, int severity, char *format, ...);
-
-extern void gdb_query (struct ui_out *uiout, int qflags, char *qprompt);
-#endif
-
 /* HACK: Code in GDB is currently checking to see the type of ui_out
    builder when determining which output to produce.  This function is
    a hack to encapsulate that test.  Once GDB manages to separate the
    CLI/MI from the core of GDB the problem should just go away ....  */
 
 extern int ui_out_is_mi_like_p (struct ui_out *uiout);
 
 /* From here on we have things that are only needed by implementation
    routines and main.c.   We should pehaps have a separate file for that,
    like a  ui-out-impl.h  file.  */
@@ skipping 80 matching lines @@
 
 extern struct ui_out *ui_out_new (struct ui_out_impl *impl,
                                   void *data,
                                   int flags);
 
 /* Redirect the ouptut of a ui_out object temporarily.  */
 
 extern int ui_out_redirect (struct ui_out *uiout, struct ui_file *outstream);
 
 #endif /* UI_OUT_H */