Merge GDB 7.5.1

gdb/ui-out.c

 /* Output generating routines for GDB.
 
    Copyright (C) 1999-2002, 2004-2005, 2007-2012 Free Software
    Foundation, Inc.
 
    Contributed by Cygnus Solutions.
    Written by Fernando Nasser for Cygnus.
 
    This file is part of GDB.
 
@@ skipping 483 matching lines @@
                         struct gdbarch *gdbarch,
                         CORE_ADDR address)
 {
   ui_out_field_string (uiout, fldname,
                        print_core_address (gdbarch, address));
 }
 
 void
 ui_out_field_stream (struct ui_out *uiout,
                      const char *fldname,
-                     struct ui_stream *buf)
+                     struct ui_file *stream)
 {
   long length;
-  char *buffer = ui_file_xstrdup (buf->stream, &length);
+  char *buffer = ui_file_xstrdup (stream, &length);
   struct cleanup *old_cleanup = make_cleanup (xfree, buffer);
 
   if (length > 0)
     ui_out_field_string (uiout, fldname, buffer);
   else
     ui_out_field_skip (uiout, fldname);
-  ui_file_rewind (buf->stream);
+  ui_file_rewind (stream);
   do_cleanups (old_cleanup);
 }
 
 /* Used to omit a field.  */
 
 void
 ui_out_field_skip (struct ui_out *uiout,
                    const char *fldname)
 {
   int fldno;
@@ skipping 57 matching lines @@
 ui_out_message (struct ui_out *uiout, int verbosity,
                 const char *format,...)
 {
   va_list args;
 
   va_start (args, format);
   uo_message (uiout, verbosity, format, args);
   va_end (args);
 }
 
-struct ui_stream *
-ui_out_stream_new (struct ui_out *uiout)
-{
-  struct ui_stream *tempbuf;
-
-  tempbuf = XMALLOC (struct ui_stream);
-  tempbuf->uiout = uiout;
-  tempbuf->stream = mem_fileopen ();
-  return tempbuf;
-}
-
-void
-ui_out_stream_delete (struct ui_stream *buf)
-{
-  ui_file_delete (buf->stream);
-  xfree (buf);
-}
-
-static void
-do_stream_delete (void *buf)
-{
-  ui_out_stream_delete (buf);
-}
-
-struct cleanup *
-make_cleanup_ui_out_stream_delete (struct ui_stream *buf)
-{
-  return make_cleanup (do_stream_delete, buf);
-}
-
-
 void
 ui_out_wrap_hint (struct ui_out *uiout, char *identstring)
 {
   uo_wrap_hint (uiout, identstring);
 }
 
 void
 ui_out_flush (struct ui_out *uiout)
 {
   uo_flush (uiout);
@@ skipping 35 matching lines @@
 /* Obtain the current verbosity level (as stablished by the
    'set verbositylevel' command.  */
 
 int
 ui_out_get_verblvl (struct ui_out *uiout)
 {
   /* FIXME: not implemented yet.  */
   return 0;
 }
 
-#if 0
-void
-ui_out_result_begin (struct ui_out *uiout, char *class)
-{
-}
-
-void
-ui_out_result_end (struct ui_out *uiout)
-{
-}
-
-void
-ui_out_info_begin (struct ui_out *uiout, char *class)
-{
-}
-
-void
-ui_out_info_end (struct ui_out *uiout)
-{
-}
-
-void
-ui_out_notify_begin (struct ui_out *uiout, char *class)
-{
-}
-
-void
-ui_out_notify_end (struct ui_out *uiout)
-{
-}
-
-void
-ui_out_error_begin (struct ui_out *uiout, char *class)
-{
-}
-
-void
-ui_out_error_end (struct ui_out *uiout)
-{
-}
-#endif
-
-#if 0
-void
-gdb_error (ui_out * uiout, int severity, char *format,...)
-{
-  va_list args;
-}
-
-void
-gdb_query (struct ui_out *uiout, int qflags, char *qprompt)
-{
-}
-#endif
-
 int
 ui_out_is_mi_like_p (struct ui_out *uiout)
 {
   return uiout->impl->is_mi_like_p;
 }
 
 /* Default gdb-out hook functions.  */
 
 static void
 default_table_begin (struct ui_out *uiout, int nbrofcols,
@@ skipping 249 matching lines @@
 
 /* List of column headers manipulation routines.  */
 
 static void
 clear_header_list (struct ui_out *uiout)
 {
   while (uiout->table.header_first != NULL)
     {
       uiout->table.header_next = uiout->table.header_first;
       uiout->table.header_first = uiout->table.header_first->next;
-      if (uiout->table.header_next->colhdr != NULL)
-        xfree (uiout->table.header_next->colhdr);
+      xfree (uiout->table.header_next->colhdr);
+      xfree (uiout->table.header_next->col_name);
       xfree (uiout->table.header_next);
     }
   gdb_assert (uiout->table.header_first == NULL);
   uiout->table.header_last = NULL;
   uiout->table.header_next = NULL;
 }
 
 static void
 append_header_to_list (struct ui_out *uiout,
                        int width,
@@ skipping 152 matching lines @@
   return uiout;
 }
 
 /* Standard gdb initialization hook.  */
 
 void
 _initialize_ui_out (void)
 {
   /* nothing needs to be done */
 }