Index: ChangeLog

2003-03-08  Andrew Cagney  <cagney@redhat.com>

	* cli-out.c: Update copyright.
	(cli_out_data): Define typedef.  Use instead of ui_out_data.

Index: mi/ChangeLog
2003-03-08  Andrew Cagney  <cagney@redhat.com>

	* mi-out.c: Update copyright.
	(mi_out_data): Define typedef.  Use instead of ui_out_data.

Index: tui/ChangeLog
2003-03-08  Andrew Cagney  <cagney@redhat.com>

	* tui-out.c: Update copyright.
	(tui_out_data): Define typedef.  Use instead of ui_out_data.
This commit is contained in:
Andrew Cagney 2003-03-08 20:04:27 +00:00
parent f49bacc80c
commit 1248ede26c
6 changed files with 79 additions and 60 deletions

View File

@ -1,3 +1,8 @@
2003-03-08 Andrew Cagney <cagney@redhat.com>
* cli-out.c: Update copyright.
(cli_out_data): Define typedef. Use instead of ui_out_data.
2003-03-08 Andrew Cagney <cagney@redhat.com>
* valarith.c (value_subscripted_rvalue): Copy the array's REGNO to

View File

@ -1,6 +1,6 @@
/* Output generating routines for GDB CLI.
Copyright 1999, 2000, 2002 Free Software Foundation, Inc.
Copyright 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
Written by Fernando Nasser for Cygnus.
@ -33,6 +33,7 @@ struct ui_out_data
struct ui_file *stream;
int suppress_output;
};
typedef struct ui_out_data cli_out_data;
/* These are the CLI output functions */
@ -110,7 +111,7 @@ cli_table_begin (struct ui_out *uiout, int nbrofcols,
int nr_rows,
const char *tblid)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
if (nr_rows == 0)
data->suppress_output = 1;
else
@ -124,7 +125,7 @@ cli_table_begin (struct ui_out *uiout, int nbrofcols,
void
cli_table_body (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
/* first, close the table header line */
@ -136,7 +137,7 @@ cli_table_body (struct ui_out *uiout)
void
cli_table_end (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
data->suppress_output = 0;
}
@ -147,7 +148,7 @@ cli_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
const char *col_name,
const char *colhdr)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
cli_field_string (uiout, 0, width, alignment, 0, colhdr);
@ -161,7 +162,7 @@ cli_begin (struct ui_out *uiout,
int level,
const char *id)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
}
@ -173,7 +174,7 @@ cli_end (struct ui_out *uiout,
enum ui_out_type type,
int level)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
}
@ -187,7 +188,7 @@ cli_field_int (struct ui_out *uiout, int fldno, int width,
{
char buffer[20]; /* FIXME: how many chars long a %d can become? */
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
sprintf (buffer, "%d", value);
@ -201,7 +202,7 @@ cli_field_skip (struct ui_out *uiout, int fldno, int width,
enum ui_align alignment,
const char *fldname)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
cli_field_string (uiout, fldno, width, alignment, fldname, "");
@ -221,7 +222,7 @@ cli_field_string (struct ui_out *uiout,
int before = 0;
int after = 0;
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
@ -268,7 +269,7 @@ cli_field_fmt (struct ui_out *uiout, int fldno,
const char *format,
va_list args)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
@ -281,7 +282,7 @@ cli_field_fmt (struct ui_out *uiout, int fldno,
void
cli_spaces (struct ui_out *uiout, int numspaces)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
print_spaces_filtered (numspaces, data->stream);
@ -290,7 +291,7 @@ cli_spaces (struct ui_out *uiout, int numspaces)
void
cli_text (struct ui_out *uiout, const char *string)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
fputs_filtered (string, data->stream);
@ -300,7 +301,7 @@ void
cli_message (struct ui_out *uiout, int verbosity,
const char *format, va_list args)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
if (ui_out_get_verblvl (uiout) >= verbosity)
@ -310,7 +311,7 @@ cli_message (struct ui_out *uiout, int verbosity,
void
cli_wrap_hint (struct ui_out *uiout, char *identstring)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
wrap_here (identstring);
@ -319,7 +320,7 @@ cli_wrap_hint (struct ui_out *uiout, char *identstring)
void
cli_flush (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
gdb_flush (data->stream);
}
@ -334,7 +335,7 @@ out_field_fmt (struct ui_out *uiout, int fldno,
const char *fldname,
const char *format,...)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
va_list args;
va_start (args, format);
@ -348,7 +349,7 @@ out_field_fmt (struct ui_out *uiout, int fldno,
static void
field_separator (void)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
fputc_filtered (' ', data->stream);
}
@ -359,7 +360,7 @@ cli_out_new (struct ui_file *stream)
{
int flags = ui_source_list;
struct ui_out_data *data = XMALLOC (struct ui_out_data);
cli_out_data *data = XMALLOC (cli_out_data);
data->stream = stream;
data->suppress_output = 0;
return ui_out_new (&cli_ui_out_impl, data, flags);
@ -368,7 +369,7 @@ cli_out_new (struct ui_file *stream)
struct ui_file *
cli_out_set_stream (struct ui_out *uiout, struct ui_file *stream)
{
struct ui_out_data *data = ui_out_data (uiout);
cli_out_data *data = ui_out_data (uiout);
struct ui_file *old = data->stream;
data->stream = stream;
return old;

View File

@ -1,3 +1,8 @@
2003-03-08 Andrew Cagney <cagney@redhat.com>
* mi-out.c: Update copyright.
(mi_out_data): Define typedef. Use instead of ui_out_data.
2003-03-01 Andrew Cagney <cagney@redhat.com>
* mi-main.c (get_register): Use register_type instead of

View File

@ -1,6 +1,6 @@
/* MI Command Set - output generating routines.
Copyright 2000, 2002 Free Software Foundation, Inc.
Copyright 2000, 2002, 2003 Free Software Foundation, Inc.
Contributed by Cygnus Solutions (a Red Hat company).
@ -32,6 +32,7 @@ struct ui_out_data
int mi_version;
struct ui_file *buffer;
};
typedef struct ui_out_data mi_out_data;
/* These are the MI output functions */
@ -107,7 +108,7 @@ mi_table_begin (struct ui_out *uiout,
int nr_rows,
const char *tblid)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
mi_open (uiout, tblid, ui_out_type_tuple);
mi_field_int (uiout, -1/*fldno*/, -1/*width*/, -1/*alin*/,
"nr_rows", nr_rows);
@ -121,7 +122,7 @@ mi_table_begin (struct ui_out *uiout,
void
mi_table_body (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
/* close the table header line if there were any headers */
@ -134,7 +135,7 @@ mi_table_body (struct ui_out *uiout)
void
mi_table_end (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
data->suppress_output = 0;
mi_close (uiout, ui_out_type_list); /* body */
mi_close (uiout, ui_out_type_tuple);
@ -147,7 +148,7 @@ mi_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
const char *col_name,
const char *colhdr)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
mi_open (uiout, NULL, ui_out_type_tuple);
@ -166,7 +167,7 @@ mi_begin (struct ui_out *uiout,
int level,
const char *id)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
mi_open (uiout, id, type);
@ -179,7 +180,7 @@ mi_end (struct ui_out *uiout,
enum ui_out_type type,
int level)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
mi_close (uiout, type);
@ -192,7 +193,7 @@ mi_field_int (struct ui_out *uiout, int fldno, int width,
enum ui_align alignment, const char *fldname, int value)
{
char buffer[20]; /* FIXME: how many chars long a %d can become? */
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
@ -206,7 +207,7 @@ void
mi_field_skip (struct ui_out *uiout, int fldno, int width,
enum ui_align alignment, const char *fldname)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
mi_field_string (uiout, fldno, width, alignment, fldname, "");
@ -223,7 +224,7 @@ mi_field_string (struct ui_out *uiout,
const char *fldname,
const char *string)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
field_separator (uiout);
@ -244,7 +245,7 @@ mi_field_fmt (struct ui_out *uiout, int fldno,
const char *format,
va_list args)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
field_separator (uiout);
@ -282,7 +283,7 @@ mi_wrap_hint (struct ui_out *uiout, char *identstring)
void
mi_flush (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
gdb_flush (data->buffer);
}
@ -296,7 +297,7 @@ static void
out_field_fmt (struct ui_out *uiout, int fldno, char *fldname,
char *format,...)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
va_list args;
field_separator (uiout);
@ -318,7 +319,7 @@ out_field_fmt (struct ui_out *uiout, int fldno, char *fldname,
static void
field_separator (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
if (data->suppress_field_separator)
data->suppress_field_separator = 0;
else
@ -330,7 +331,7 @@ mi_open (struct ui_out *uiout,
const char *name,
enum ui_out_type type)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
field_separator (uiout);
data->suppress_field_separator = 1;
if (name)
@ -352,7 +353,7 @@ static void
mi_close (struct ui_out *uiout,
enum ui_out_type type)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
switch (type)
{
case ui_out_type_tuple:
@ -372,7 +373,7 @@ mi_close (struct ui_out *uiout,
void
mi_out_buffered (struct ui_out *uiout, char *string)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
fprintf_unfiltered (data->buffer, "%s", string);
}
@ -381,7 +382,7 @@ mi_out_buffered (struct ui_out *uiout, char *string)
void
mi_out_rewind (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
ui_file_rewind (data->buffer);
}
@ -397,7 +398,7 @@ void
mi_out_put (struct ui_out *uiout,
struct ui_file *stream)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
ui_file_put (data->buffer, do_write, stream);
ui_file_rewind (data->buffer);
}
@ -407,7 +408,7 @@ mi_out_put (struct ui_out *uiout,
int
mi_version (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
mi_out_data *data = ui_out_data (uiout);
return data->mi_version;
}
@ -417,7 +418,7 @@ struct ui_out *
mi_out_new (int mi_version)
{
int flags = 0;
struct ui_out_data *data = XMALLOC (struct ui_out_data);
mi_out_data *data = XMALLOC (mi_out_data);
data->suppress_field_separator = 0;
data->suppress_output = 0;
data->mi_version = mi_version;

View File

@ -1,3 +1,8 @@
2003-03-08 Andrew Cagney <cagney@redhat.com>
* tui-out.c: Update copyright.
(tui_out_data): Define typedef. Use instead of ui_out_data.
2003-02-14 Andrew Cagney <ac131313@redhat.com>
* tui.c (tui_enable, tui_disable): Don't modify tui_version.

View File

@ -1,6 +1,7 @@
/* Output generating routines for GDB CLI.
Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
Copyright 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
Inc.
Contributed by Cygnus Solutions.
Written by Fernando Nasser for Cygnus.
@ -35,6 +36,7 @@ struct ui_out_data
int line;
int start_of_line;
};
struct ui_out_data tui_out_data;
/* These are the CLI output functions */
@ -112,7 +114,7 @@ tui_table_begin (struct ui_out *uiout, int nbrofcols,
int nr_rows,
const char *tblid)
{
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
if (nr_rows == 0)
data->suppress_output = 1;
else
@ -126,7 +128,7 @@ tui_table_begin (struct ui_out *uiout, int nbrofcols,
void
tui_table_body (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
/* first, close the table header line */
@ -138,7 +140,7 @@ tui_table_body (struct ui_out *uiout)
void
tui_table_end (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
data->suppress_output = 0;
}
@ -149,7 +151,7 @@ tui_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
const char *col_name,
const char *colhdr)
{
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
tui_field_string (uiout, 0, width, alignment, 0, colhdr);
@ -163,7 +165,7 @@ tui_begin (struct ui_out *uiout,
int level,
const char *id)
{
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
}
@ -175,7 +177,7 @@ tui_end (struct ui_out *uiout,
enum ui_out_type type,
int level)
{
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
}
@ -189,7 +191,7 @@ tui_field_int (struct ui_out *uiout, int fldno, int width,
{
char buffer[20]; /* FIXME: how many chars long a %d can become? */
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
@ -212,7 +214,7 @@ tui_field_skip (struct ui_out *uiout, int fldno, int width,
enum ui_align alignment,
const char *fldname)
{
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
tui_field_string (uiout, fldno, width, alignment, fldname, "");
@ -232,7 +234,7 @@ tui_field_string (struct ui_out *uiout,
int before = 0;
int after = 0;
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
@ -290,7 +292,7 @@ tui_field_fmt (struct ui_out *uiout, int fldno,
const char *format,
va_list args)
{
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
@ -304,7 +306,7 @@ tui_field_fmt (struct ui_out *uiout, int fldno,
void
tui_spaces (struct ui_out *uiout, int numspaces)
{
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
print_spaces_filtered (numspaces, data->stream);
@ -313,7 +315,7 @@ tui_spaces (struct ui_out *uiout, int numspaces)
void
tui_text (struct ui_out *uiout, const char *string)
{
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
data->start_of_line ++;
@ -335,7 +337,7 @@ void
tui_message (struct ui_out *uiout, int verbosity,
const char *format, va_list args)
{
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
if (ui_out_get_verblvl (uiout) >= verbosity)
@ -345,7 +347,7 @@ tui_message (struct ui_out *uiout, int verbosity,
void
tui_wrap_hint (struct ui_out *uiout, char *identstring)
{
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
if (data->suppress_output)
return;
wrap_here (identstring);
@ -354,7 +356,7 @@ tui_wrap_hint (struct ui_out *uiout, char *identstring)
void
tui_flush (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
gdb_flush (data->stream);
}
@ -369,7 +371,7 @@ out_field_fmt (struct ui_out *uiout, int fldno,
const char *fldname,
const char *format,...)
{
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
va_list args;
va_start (args, format);
@ -383,7 +385,7 @@ out_field_fmt (struct ui_out *uiout, int fldno,
static void
field_separator (void)
{
struct ui_out_data *data = ui_out_data (uiout);
tui_out_data *data = ui_out_data (uiout);
fputc_filtered (' ', data->stream);
}
@ -394,7 +396,7 @@ tui_out_new (struct ui_file *stream)
{
int flags = 0;
struct ui_out_data *data = XMALLOC (struct ui_out_data);
tui_out_data *data = XMALLOC (tui_out_data);
data->stream = stream;
data->suppress_output = 0;
data->line = -1;