#include "ui-out.h"
#include "cli-out.h"
#include "gdb_string.h"
+#include "gdb_assert.h"
/* Convenience macro for allocting typesafe memory. */
struct ui_out_data
{
struct ui_file *stream;
+ int suppress_output;
};
/* These are the CLI output functions */
static void cli_table_begin (struct ui_out *uiout, int nbrofcols,
- const char *tblid);
+ int nr_rows, const char *tblid);
static void cli_table_body (struct ui_out *uiout);
static void cli_table_end (struct ui_out *uiout);
static void cli_table_header (struct ui_out *uiout, int width,
- enum ui_align alig,
+ enum ui_align alig, const char *col_name,
const char *colhdr);
static void cli_begin (struct ui_out *uiout, enum ui_out_type type,
int level, const char *lstid);
cli_text,
cli_message,
cli_wrap_hint,
- cli_flush
+ cli_flush,
+ 0, /* Does not need MI hacks (i.e. needs CLI hacks). */
};
/* Prototypes for local functions */
void
cli_table_begin (struct ui_out *uiout, int nbrofcols,
+ int nr_rows,
const char *tblid)
{
+ struct ui_out_data *data = ui_out_data (uiout);
+ if (nr_rows == 0)
+ data->suppress_output = 1;
+ else
+ /* Only the table suppresses the output and, fortunatly, a table
+ is not a recursive data structure. */
+ gdb_assert (data->suppress_output == 0);
}
/* Mark beginning of a table body */
void
cli_table_body (struct ui_out *uiout)
{
+ struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
/* first, close the table header line */
cli_text (uiout, "\n");
}
void
cli_table_end (struct ui_out *uiout)
{
+ struct ui_out_data *data = ui_out_data (uiout);
+ data->suppress_output = 0;
}
/* Specify table header */
void
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);
+ if (data->suppress_output)
+ return;
cli_field_string (uiout, 0, width, alignment, 0, colhdr);
}
int level,
const char *id)
{
+ struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
}
/* Mark end of a list */
enum ui_out_type type,
int level)
{
+ struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
}
/* output an int field */
{
char buffer[20]; /* FIXME: how many chars long a %d can become? */
+ struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
sprintf (buffer, "%d", value);
cli_field_string (uiout, fldno, width, alignment, fldname, buffer);
}
enum ui_align alignment,
const char *fldname)
{
+ struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
cli_field_string (uiout, fldno, width, alignment, fldname, "");
}
int before = 0;
int after = 0;
+ struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
+
if ((align != ui_noalign) && string)
{
before = width - strlen (string);
va_list args)
{
struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
+
vfprintf_filtered (data->stream, format, args);
if (align != ui_noalign)
cli_spaces (struct ui_out *uiout, int numspaces)
{
struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
print_spaces_filtered (numspaces, data->stream);
}
cli_text (struct ui_out *uiout, const char *string)
{
struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
fputs_filtered (string, data->stream);
}
const char *format, va_list args)
{
struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
if (ui_out_get_verblvl (uiout) >= verbosity)
vfprintf_unfiltered (data->stream, format, args);
}
void
cli_wrap_hint (struct ui_out *uiout, char *identstring)
{
+ struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
wrap_here (identstring);
}
struct ui_out_data *data = XMALLOC (struct ui_out_data);
data->stream = stream;
+ data->suppress_output = 0;
return ui_out_new (&cli_ui_out_impl, data, flags);
}