X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fui-out.c;h=60d18eee2bb0829213c84d836459edff41dc0ff3;hb=ec8f76882145c71bef81a9cadf0bf51ff9fa5b35;hp=26bd04f33f1abfe862e996f8a0dd504c21ae5d23;hpb=6d3d12ebef6fa7dd6bc8c34fbc5e440ac8d0a8c6;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/ui-out.c b/gdb/ui-out.c index 26bd04f33f..60d18eee2b 100644 --- a/gdb/ui-out.c +++ b/gdb/ui-out.c @@ -1,6 +1,6 @@ /* Output generating routines for GDB. - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2016 Free Software Foundation, Inc. Contributed by Cygnus Solutions. Written by Fernando Nasser for Cygnus. @@ -31,18 +31,12 @@ struct ui_out_hdr { int colno; int width; - int alignment; + enum ui_align alignment; char *col_name; char *colhdr; 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. */ @@ -123,8 +117,7 @@ current_level (struct ui_out *uiout) /* 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; @@ -153,85 +146,6 @@ pop_level (struct ui_out *uiout, 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, - 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, @@ -269,14 +183,14 @@ static void uo_data_destroy (struct ui_out *uiout); extern void _initialize_ui_out (void); static void append_header_to_list (struct ui_out *uiout, int width, - int alignment, const char *col_name, + enum ui_align alignment, const char *col_name, const char *colhdr); static int get_next_header (struct ui_out *uiout, int *colno, int *width, - int *alignment, char **colhdr); + enum ui_align *alignment, char **colhdr); static void clear_header_list (struct ui_out *uiout); static void clear_table (struct ui_out *uiout); static void verify_field (struct ui_out *uiout, int *fldno, int *width, - int *align); + enum ui_align *align); /* exported functions (ui_out API) */ @@ -360,7 +274,7 @@ and before table_body.")); static void do_cleanup_table_end (void *data) { - struct ui_out *ui_out = data; + struct ui_out *ui_out = (struct ui_out *) data; ui_out_table_end (ui_out); } @@ -395,12 +309,12 @@ specified after table_body.")); { int fldno; int width; - int align; + enum ui_align align; 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. */ @@ -429,7 +343,8 @@ struct ui_out_end_cleanup_data static void do_cleanup_end (void *data) { - struct ui_out_end_cleanup_data *end_cleanup_data = data; + struct ui_out_end_cleanup_data *end_cleanup_data + = (struct ui_out_end_cleanup_data *) data; ui_out_end (end_cleanup_data->uiout, end_cleanup_data->type); xfree (end_cleanup_data); @@ -470,7 +385,7 @@ ui_out_field_int (struct ui_out *uiout, { int fldno; int width; - int align; + enum ui_align align; verify_field (uiout, &fldno, &width, &align); @@ -486,7 +401,7 @@ ui_out_field_fmt_int (struct ui_out *uiout, { int fldno; int width; - int align; + enum ui_align align; verify_field (uiout, &fldno, &width, &align); @@ -510,16 +425,13 @@ ui_out_field_stream (struct ui_out *uiout, 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. */ @@ -530,7 +442,7 @@ ui_out_field_skip (struct ui_out *uiout, { int fldno; int width; - int align; + enum ui_align align; verify_field (uiout, &fldno, &width, &align); @@ -544,7 +456,7 @@ ui_out_field_string (struct ui_out *uiout, { int fldno; int width; - int align; + enum ui_align align; verify_field (uiout, &fldno, &width, &align); @@ -560,7 +472,7 @@ ui_out_field_fmt (struct ui_out *uiout, va_list args; int fldno; int width; - int align; + enum ui_align align; /* Will not align, but has to call anyway. */ verify_field (uiout, &fldno, &width, &align); @@ -657,111 +569,6 @@ 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, - 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 @@ -956,7 +763,7 @@ clear_header_list (struct ui_out *uiout) static void append_header_to_list (struct ui_out *uiout, int width, - int alignment, + enum ui_align alignment, const char *col_name, const char *colhdr) { @@ -1002,7 +809,7 @@ static int get_next_header (struct ui_out *uiout, int *colno, int *width, - int *alignment, + enum ui_align *alignment, char **colhdr) { /* There may be no headers at all or we may have used all columns. */ @@ -1023,7 +830,8 @@ get_next_header (struct ui_out *uiout, available/applicable). */ static void -verify_field (struct ui_out *uiout, int *fldno, int *width, int *align) +verify_field (struct ui_out *uiout, int *fldno, int *width, + enum ui_align *align) { struct ui_out_level *current = current_level (uiout); char *text; @@ -1090,7 +898,7 @@ ui_out_query_field (struct ui_out *uiout, int colno, 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,