/* Output generating routines for GDB.
- Copyright 1999, 2000 Free Software Foundation, Inc.
+ Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
Written by Fernando Nasser for Cygnus.
/* Mark beginning of a table */
void
-ui_out_table_begin (uiout, nbrofcols, tblid)
- struct ui_out *uiout;
- int nbrofcols;
- char *tblid;
+ui_out_table_begin (struct ui_out *uiout, int nbrofcols, char *tblid)
{
if (uiout->table_flag)
- internal_error ("gdb/ui_out.c: tables cannot be nested; table_begin found before \
+ internal_error (__FILE__, __LINE__,
+ "tables cannot be nested; table_begin found before \
previous table_end.");
uiout->table_flag = 1;
}
void
-ui_out_table_body (uiout)
- struct ui_out *uiout;
+ui_out_table_body (struct ui_out *uiout)
{
if (!uiout->table_flag)
- internal_error ("gdb/ui_out.c: table_body outside a table is not valid; it must be \
+ internal_error (__FILE__, __LINE__,
+ "table_body outside a table is not valid; it must be \
after a table_begin and before a table_end.");
if (uiout->body_flag)
- internal_error ("gdb/ui_out.c: extra table_body call not allowed; there must be \
+ internal_error (__FILE__, __LINE__,
+ "extra table_body call not allowed; there must be \
only one table_body after a table_begin and before a table_end.");
if (uiout->headercurr->colno != uiout->table_columns)
- internal_error ("gdb/ui_out.c: number of headers differ from number of table \
+ internal_error (__FILE__, __LINE__,
+ "number of headers differ from number of table \
columns.");
uiout->body_flag = 1;
}
void
-ui_out_table_end (uiout)
- struct ui_out *uiout;
+ui_out_table_end (struct ui_out *uiout)
{
if (!uiout->table_flag)
- internal_error ("gdb/ui_out.c: misplaced table_end or missing table_begin.");
+ internal_error (__FILE__, __LINE__,
+ "misplaced table_end or missing table_begin.");
uiout->body_flag = 0;
uiout->table_flag = 0;
uo_table_end (uiout);
if (uiout->table_id)
- free (uiout->table_id);
+ xfree (uiout->table_id);
clear_header_list (uiout);
}
void
-ui_out_table_header (uiout, width, alignment, colhdr)
- struct ui_out *uiout;
- int width;
- enum ui_align alignment;
- char *colhdr;
+ui_out_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
+ char *colhdr)
{
if (!uiout->table_flag || uiout->body_flag)
- internal_error ("ui_out: table header must be specified after table_begin \
+ internal_error (__FILE__, __LINE__,
+ "table header must be specified after table_begin \
and before table_body.");
append_header_to_list (uiout, width, alignment, colhdr);
}
void
-ui_out_list_begin (uiout, lstid)
- struct ui_out *uiout;
- char *lstid;
+ui_out_list_begin (struct ui_out *uiout, char *lstid)
{
if (uiout->table_flag && !uiout->body_flag)
- internal_error ("ui_out: table header or table_body expected; lists must be \
+ internal_error (__FILE__, __LINE__,
+ "table header or table_body expected; lists must be \
specified after table_body.");
if (uiout->list_flag >= 4)
- internal_error ("ui_out: list depth exceeded; only 4 levels of lists can be \
+ internal_error (__FILE__, __LINE__,
+ "list depth exceeded; only 4 levels of lists can be \
nested.");
uiout->list_flag++;
}
void
-ui_out_list_end (uiout)
- struct ui_out *uiout;
+ui_out_list_end (struct ui_out *uiout)
{
if (!uiout->list_flag)
- internal_error ("ui_out: misplaced list_end; there is no list to be closed.");
+ internal_error (__FILE__, __LINE__,
+ "misplaced list_end; there is no list to be closed.");
uo_list_end (uiout, uiout->list_flag);
uiout->list_flag--;
}
+static void
+do_list_end (void *uiout)
+{
+ ui_out_list_end (uiout);
+}
+
+struct cleanup *
+make_cleanup_ui_out_list_end (struct ui_out *uiout)
+{
+ return make_cleanup (do_list_end, uiout);
+}
+
void
-ui_out_field_int (uiout, fldname, value)
- struct ui_out *uiout;
- char *fldname;
- int value;
+ui_out_field_int (struct ui_out *uiout, char *fldname, int value)
{
int fldno;
int width;
}
void
-ui_out_field_core_addr (uiout, fldname, address)
- struct ui_out *uiout;
- char *fldname;
- CORE_ADDR address;
+ui_out_field_core_addr (struct ui_out *uiout, char *fldname, CORE_ADDR address)
{
char addstr[20];
}
void
-ui_out_field_stream (uiout, fldname, buf)
- struct ui_out *uiout;
- char *fldname;
- struct ui_stream *buf;
+ui_out_field_stream (struct ui_out *uiout, char *fldname, struct ui_stream *buf)
{
long length;
char *buffer = ui_file_xstrdup (buf->stream, &length);
- struct cleanup *old_cleanup = make_cleanup (free, buffer);
+ struct cleanup *old_cleanup = make_cleanup (xfree, buffer);
if (length > 0)
ui_out_field_string (uiout, fldname, buffer);
else
/* used to ommit a field */
void
-ui_out_field_skip (uiout, fldname)
- struct ui_out *uiout;
- char *fldname;
+ui_out_field_skip (struct ui_out *uiout, char *fldname)
{
int fldno;
int width;
}
void
-ui_out_spaces (uiout, numspaces)
- struct ui_out *uiout;
- int numspaces;
+ui_out_spaces (struct ui_out *uiout, int numspaces)
{
uo_spaces (uiout, numspaces);
}
void
-ui_out_text (uiout, string)
- struct ui_out *uiout;
- char *string;
+ui_out_text (struct ui_out *uiout, char *string)
{
uo_text (uiout, string);
}
}
struct ui_stream *
-ui_out_stream_new (uiout)
- struct ui_out *uiout;
+ui_out_stream_new (struct ui_out *uiout)
{
struct ui_stream *tempbuf;
}
void
-ui_out_stream_delete (buf)
- struct ui_stream *buf;
+ui_out_stream_delete (struct ui_stream *buf)
{
ui_file_delete (buf->stream);
- free (buf);
+ xfree (buf);
}
static void
void
-ui_out_wrap_hint (uiout, identstring)
- struct ui_out *uiout;
- char *identstring;
+ui_out_wrap_hint (struct ui_out *uiout, char *identstring)
{
uo_wrap_hint (uiout, identstring);
}
void
-ui_out_flush (uiout)
- struct ui_out *uiout;
+ui_out_flush (struct ui_out *uiout)
{
uo_flush (uiout);
}
/* set the flags specified by the mask given */
int
-ui_out_set_flags (uiout, mask)
- struct ui_out *uiout;
- int mask;
+ui_out_set_flags (struct ui_out *uiout, int mask)
{
- int oldflags;
+ int oldflags = uiout->flags;
uiout->flags |= mask;
/* clear the flags specified by the mask given */
int
-ui_out_clear_flags (uiout, mask)
- struct ui_out *uiout;
- int mask;
+ui_out_clear_flags (struct ui_out *uiout, int mask)
{
- int oldflags;
+ int oldflags = uiout->flags;
uiout->flags &= ~mask;
/* test the flags against the mask given */
int
-ui_out_test_flags (uiout, mask)
- struct ui_out *uiout;
- int mask;
+ui_out_test_flags (struct ui_out *uiout, int mask)
{
return (uiout->flags & mask);
}
'set verbositylevel' command */
int
-ui_out_get_verblvl (uiout)
- struct ui_out *uiout;
+ui_out_get_verblvl (struct ui_out *uiout)
{
/* FIXME: not implemented yet */
return 0;
#if 0
void
-ui_out_result_begin (uiout, class)
- struct ui_out *uiout;
- char *class;
+ui_out_result_begin (struct ui_out *uiout, char *class)
{
}
void
-ui_out_result_end (uiout)
- struct ui_out *uiout;
+ui_out_result_end (struct ui_out *uiout)
{
}
void
-ui_out_info_begin (uiout, class)
- struct ui_out *uiout;
- char *class;
+ui_out_info_begin (struct ui_out *uiout, char *class)
{
}
void
-ui_out_info_end (uiout)
- struct ui_out *uiout;
+ui_out_info_end (struct ui_out *uiout)
{
}
void
-ui_out_notify_begin (uiout, class)
- struct ui_out *uiout;
- char *class;
+ui_out_notify_begin (struct ui_out *uiout, char *class)
{
}
void
-ui_out_notify_end (uiout)
- struct ui_out *uiout;
+ui_out_notify_end (struct ui_out *uiout)
{
}
void
-ui_out_error_begin (uiout, class)
- struct ui_out *uiout;
- char *class;
+ui_out_error_begin (struct ui_out *uiout, char *class)
{
}
void
-ui_out_error_end (uiout)
- struct ui_out *uiout;
+ui_out_error_end (struct ui_out *uiout)
{
}
#endif
}
void
-gdb_query (uiout, qflags, qprompt)
- struct ui_out *uiout;
- int flags;
- char *qprompt;
+gdb_query (struct ui_out *uiout, int qflags, char *qprompt)
{
}
#endif
/* default gdb-out hook functions */
static void
-default_table_begin (uiout, nbrofcols, tblid)
- struct ui_out *uiout;
- int nbrofcols;
- char *tblid;
+default_table_begin (struct ui_out *uiout, int nbrofcols, char *tblid)
{
}
static void
-default_table_body (uiout)
- struct ui_out *uiout;
+default_table_body (struct ui_out *uiout)
{
}
static void
-default_table_end (uiout)
- struct ui_out *uiout;
+default_table_end (struct ui_out *uiout)
{
}
static void
-default_table_header (uiout, width, alignment, colhdr)
- struct ui_out *uiout;
- int width;
- enum ui_align alignment;
- char *colhdr;
+default_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
+ char *colhdr)
{
}
static void
-default_list_begin (uiout, list_flag, lstid)
- struct ui_out *uiout;
- int list_flag;
- char *lstid;
+default_list_begin (struct ui_out *uiout, int list_flag, char *lstid)
{
}
static void
-default_list_end (uiout, list_flag)
- struct ui_out *uiout;
- int list_flag;
+default_list_end (struct ui_out *uiout, int list_flag)
{
}
static void
-default_field_int (uiout, fldno, width, align, fldname, value)
- struct ui_out *uiout;
- int fldno;
- int width;
- enum ui_align align;
- char *fldname;
- int value;
+default_field_int (struct ui_out *uiout, int fldno, int width,
+ enum ui_align align, char *fldname, int value)
{
}
static void
-default_field_skip (uiout, fldno, width, align, fldname)
- struct ui_out *uiout;
- int fldno;
- int width;
- enum ui_align align;
- char *fldname;
+default_field_skip (struct ui_out *uiout, int fldno, int width,
+ enum ui_align align, char *fldname)
{
}
}
static void
-default_field_fmt (uiout, fldno, width, align, fldname, format, args)
- struct ui_out *uiout;
- int fldno;
- int width;
- enum ui_align align;
- char *fldname;
- char *format;
- va_list args;
+default_field_fmt (struct ui_out *uiout, int fldno, int width,
+ enum ui_align align, char *fldname, char *format,
+ va_list args)
{
}
static void
-default_spaces (uiout, numspaces)
- struct ui_out *uiout;
- int numspaces;
+default_spaces (struct ui_out *uiout, int numspaces)
{
}
static void
-default_text (uiout, string)
- struct ui_out *uiout;
- char *string;
+default_text (struct ui_out *uiout, char *string)
{
}
static void
-default_message (uiout, verbosity, format, args)
- struct ui_out *uiout;
- int verbosity;
- char *format;
- va_list args;
+default_message (struct ui_out *uiout, int verbosity, char *format,
+ va_list args)
{
}
static void
-default_wrap_hint (uiout, identstring)
- struct ui_out *uiout;
- char *identstring;
+default_wrap_hint (struct ui_out *uiout, char *identstring)
{
}
static void
-default_flush (uiout)
- struct ui_out *uiout;
+default_flush (struct ui_out *uiout)
{
}
/* list of column headers manipulation routines */
static void
-clear_header_list (uiout)
- struct ui_out *uiout;
+clear_header_list (struct ui_out *uiout)
{
while (uiout->headerfirst != NULL)
{
uiout->headercurr = uiout->headerfirst;
uiout->headerfirst = uiout->headerfirst->next;
if (uiout->headercurr->colhdr != NULL)
- free (uiout->headercurr->colhdr);
- free (uiout->headercurr);
+ xfree (uiout->headercurr->colhdr);
+ xfree (uiout->headercurr);
}
uiout->headerlast = NULL;
uiout->headercurr = NULL;
if (uiout->table_flag)
{
if (!uiout->body_flag)
- internal_error ("ui_out: table_body missing; table fields must be \
+ internal_error (__FILE__, __LINE__,
+ "table_body missing; table fields must be \
specified after table_body and inside a list.");
if (!uiout->list_flag)
- internal_error ("ui_out: list_begin missing; table fields must be \
+ internal_error (__FILE__, __LINE__,
+ "list_begin missing; table fields must be \
specified after table_body and inside a list.");
}
}
&& get_curr_header (uiout, &colno, width, align, &text))
{
if (fldno != colno)
- internal_error ("gdb/ui-out.c: ui-out internal error in handling headers.");
+ internal_error (__FILE__, __LINE__,
+ "ui-out internal error in handling headers.");
}
else
{
/* access to ui_out format private members */
void
-ui_out_get_field_separator (uiout)
- struct ui_out *uiout;
+ui_out_get_field_separator (struct ui_out *uiout)
{
}
/* standard gdb initialization hook */
void
-_initialize_ui_out ()
+_initialize_ui_out (void)
{
/* nothing needs to be done */
}