/* Output generating routines for GDB.
- Copyright (C) 1999-2015 Free Software Foundation, Inc.
+ Copyright (C) 1999-2016 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
Written by Fernando Nasser for Cygnus.
struct ui_out_hdr *next;
};
-/* Maintain a stack so that the info applicable to the inner most list
- is always available. Stack/nested level 0 is reserved for the
- top-level result. */
-
-enum { MAX_UI_OUT_LEVELS = 8 };
-
struct ui_out_level
{
/* Count each field; the first element is for non-list fields. */
/* The ui_out structure */
-/* Any change here requires a corresponding one in the initialization
- of the default uiout, which is statically initialized. */
struct ui_out
{
/* Create a new level, of TYPE. Return the new level's index. */
static int
push_level (struct ui_out *uiout,
- enum ui_out_type type,
- const char *id)
+ enum ui_out_type type)
{
struct ui_out_level *current;
return uiout->level + 1;
}
-
-/* These are the default implementation functions. */
-
-static void default_table_begin (struct ui_out *uiout, int nbrofcols,
- int nr_rows, const char *tblid);
-static void default_table_body (struct ui_out *uiout);
-static void default_table_end (struct ui_out *uiout);
-static void default_table_header (struct ui_out *uiout, int width,
- enum ui_align alig, const char *col_name,
- const char *colhdr);
-static void default_begin (struct ui_out *uiout,
- enum ui_out_type type,
- int level, const char *id);
-static void default_end (struct ui_out *uiout,
- enum ui_out_type type,
- int level);
-static void default_field_int (struct ui_out *uiout, int fldno, int width,
- enum ui_align alig,
- const char *fldname,
- int value);
-static void default_field_skip (struct ui_out *uiout, int fldno, int width,
- enum ui_align alig,
- const char *fldname);
-static void default_field_string (struct ui_out *uiout, int fldno, int width,
- enum ui_align align,
- const char *fldname,
- const char *string);
-static void default_field_fmt (struct ui_out *uiout, int fldno,
- int width, enum ui_align align,
- const char *fldname,
- const char *format,
- va_list args) ATTRIBUTE_PRINTF (6, 0);
-static void default_spaces (struct ui_out *uiout, int numspaces);
-static void default_text (struct ui_out *uiout, const char *string);
-static void default_message (struct ui_out *uiout, int verbosity,
- const char *format,
- va_list args) ATTRIBUTE_PRINTF (3, 0);
-static void default_wrap_hint (struct ui_out *uiout, char *identstring);
-static void default_flush (struct ui_out *uiout);
-static void default_data_destroy (struct ui_out *uiout);
-
-/* This is the default ui-out implementation functions vector. */
-
-const struct ui_out_impl default_ui_out_impl =
-{
- default_table_begin,
- default_table_body,
- default_table_end,
- default_table_header,
- default_begin,
- default_end,
- default_field_int,
- default_field_skip,
- default_field_string,
- default_field_fmt,
- default_spaces,
- default_text,
- default_message,
- default_wrap_hint,
- default_flush,
- NULL, /* redirect */
- default_data_destroy,
- 0, /* Does not need MI hacks. */
-};
-
-/* The default ui_out */
-
-struct ui_out def_uiout =
-{
- 0, /* flags */
- &default_ui_out_impl, /* impl */
-};
-
-/* Pointer to current ui_out */
-/* FIXME: This should not be a global, but something passed down from main.c
- or top.c. */
-
-struct ui_out *current_uiout = &def_uiout;
-
/* These are the interfaces to implementation functions. */
static void uo_table_begin (struct ui_out *uiout, int nbrofcols,
static void uo_message (struct ui_out *uiout, int verbosity,
const char *format, va_list args)
ATTRIBUTE_PRINTF (3, 0);
-static void uo_wrap_hint (struct ui_out *uiout, char *identstring);
+static void uo_wrap_hint (struct ui_out *uiout, const char *identstring);
static void uo_flush (struct ui_out *uiout);
static int uo_redirect (struct ui_out *uiout, struct ui_file *outstream);
-static void uo_data_destroy (struct ui_out *uiout);
/* Prototypes for local functions */
-extern void _initialize_ui_out (void);
static void append_header_to_list (struct ui_out *uiout, int width,
enum ui_align alignment, const char *col_name,
const char *colhdr);
verify_field (uiout, &fldno, &width, &align);
}
- new_level = push_level (uiout, type, id);
+ new_level = push_level (uiout, type);
/* If the push puts us at the same level as a table row entry, we've
got a new table row. Put the header pointer back to the start. */
const char *fldname,
struct ui_file *stream)
{
- long length;
- char *buffer = ui_file_xstrdup (stream, &length);
- struct cleanup *old_cleanup = make_cleanup (xfree, buffer);
+ std::string buffer = ui_file_as_string (stream);
- if (length > 0)
- ui_out_field_string (uiout, fldname, buffer);
+ if (!buffer.empty ())
+ ui_out_field_string (uiout, fldname, buffer.c_str ());
else
ui_out_field_skip (uiout, fldname);
ui_file_rewind (stream);
- do_cleanups (old_cleanup);
}
/* Used to omit a field. */
}
void
-ui_out_wrap_hint (struct ui_out *uiout, char *identstring)
+ui_out_wrap_hint (struct ui_out *uiout, const char *identstring)
{
uo_wrap_hint (uiout, identstring);
}
return uo_redirect (uiout, outstream);
}
-/* Set the flags specified by the mask given. */
-int
-ui_out_set_flags (struct ui_out *uiout, int mask)
-{
- int oldflags = uiout->flags;
-
- uiout->flags |= mask;
- return oldflags;
-}
-
-/* Clear the flags specified by the mask given. */
-int
-ui_out_clear_flags (struct ui_out *uiout, int mask)
-{
- int oldflags = uiout->flags;
-
- uiout->flags &= ~mask;
- return oldflags;
-}
-
/* Test the flags against the mask given. */
int
ui_out_test_flags (struct ui_out *uiout, int mask)
return uiout->impl->is_mi_like_p;
}
-/* Default gdb-out hook functions. */
-
-static void
-default_table_begin (struct ui_out *uiout, int nbrofcols,
- int nr_rows,
- const char *tblid)
-{
-}
-
-static void
-default_table_body (struct ui_out *uiout)
-{
-}
-
-static void
-default_table_end (struct ui_out *uiout)
-{
-}
-
-static void
-default_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
- const char *col_name,
- const char *colhdr)
-{
-}
-
-static void
-default_begin (struct ui_out *uiout,
- enum ui_out_type type,
- int level,
- const char *id)
-{
-}
-
-static void
-default_end (struct ui_out *uiout,
- enum ui_out_type type,
- int level)
-{
-}
-
-static void
-default_field_int (struct ui_out *uiout, int fldno, int width,
- enum ui_align align,
- const char *fldname, int value)
-{
-}
-
-static void
-default_field_skip (struct ui_out *uiout, int fldno, int width,
- enum ui_align align, const char *fldname)
-{
-}
-
-static void
-default_field_string (struct ui_out *uiout,
- int fldno,
- int width,
- enum ui_align align,
- const char *fldname,
- const char *string)
-{
-}
-
-static void
-default_field_fmt (struct ui_out *uiout, int fldno, int width,
- enum ui_align align,
- const char *fldname,
- const char *format,
- va_list args)
-{
-}
-
-static void
-default_spaces (struct ui_out *uiout, int numspaces)
-{
-}
-
-static void
-default_text (struct ui_out *uiout, const char *string)
-{
-}
-
-static void
-default_message (struct ui_out *uiout, int verbosity,
- const char *format,
- va_list args)
-{
-}
-
-static void
-default_wrap_hint (struct ui_out *uiout, char *identstring)
-{
-}
-
-static void
-default_flush (struct ui_out *uiout)
-{
-}
-
-static void
-default_data_destroy (struct ui_out *uiout)
-{
-}
-
/* Interface to the implementation functions. */
void
}
void
-uo_wrap_hint (struct ui_out *uiout, char *identstring)
+uo_wrap_hint (struct ui_out *uiout, const char *identstring)
{
if (!uiout->impl->wrap_hint)
return;
{
if (!uiout->impl->redirect)
return -1;
- uiout->impl->redirect (uiout, outstream);
- return 0;
-}
-
-void
-uo_data_destroy (struct ui_out *uiout)
-{
- if (!uiout->impl->data_destroy)
- return;
-
- uiout->impl->data_destroy (uiout);
+ return uiout->impl->redirect (uiout, outstream);
}
/* local functions */
return 0;
}
-/* Initalize private members at startup. */
+/* Initialize private members at startup. */
struct ui_out *
ui_out_new (const struct ui_out_impl *impl, void *data,
uiout->table.header_next = NULL;
return uiout;
}
-
-/* Free UIOUT and the memory areas it references. */
-
-void
-ui_out_destroy (struct ui_out *uiout)
-{
- int i;
- struct ui_out_level *current;
-
- /* Make sure that all levels are freed in the case where levels have
- been pushed, but not popped before the ui_out object is
- destroyed. */
- for (i = 0;
- VEC_iterate (ui_out_level_p, uiout->levels, i, current);
- ++i)
- xfree (current);
-
- VEC_free (ui_out_level_p, uiout->levels);
- uo_data_destroy (uiout);
- clear_table (uiout);
- xfree (uiout);
-}
-
-/* Standard gdb initialization hook. */
-
-void
-_initialize_ui_out (void)
-{
- /* nothing needs to be done */
-}
projects / deliverable / binutils-gdb.git / blobdiff