{
ui_file *stream = m_streams.back ();
stream->emit_style_escape (style);
- if (test_flags (unfiltered_output))
- stream->puts_unfiltered (string);
- else
- stream->puts (string);
+ stream->puts (string);
stream->emit_style_escape (ui_file_style ());
}
if (m_suppress_output)
return;
- if (test_flags (unfiltered_output))
- fprintf_unfiltered (m_streams.back (), "%*s", numspaces, "");
- else
- print_spaces_filtered (numspaces, m_streams.back ());
+ print_spaces (numspaces, m_streams.back ());
}
void
if (m_suppress_output)
return;
- if (test_flags (unfiltered_output))
- gdb_puts (string, m_streams.back ());
- else
- gdb_puts (string, m_streams.back ());
+ gdb_puts (string, m_streams.back ());
}
void
{
ui_file *stream = m_streams.back ();
stream->emit_style_escape (style);
- if (test_flags (unfiltered_output))
- stream->puts_unfiltered (str.c_str ());
- else
- stream->puts (str.c_str ());
+ stream->puts (str.c_str ());
stream->emit_style_escape (ui_file_style ());
}
}
meter.name = name;
if (!stream->isatty ())
{
- fprintf_unfiltered (stream, "%s...", meter.name.c_str ());
+ gdb_printf (stream, "%s...", meter.name.c_str ());
gdb_flush (stream);
meter.printing = WORKING;
}
if (meter.printing == START)
{
- fprintf_unfiltered (stream, "%s\n", meter.name.c_str ());
+ gdb_printf (stream, "%s\n", meter.name.c_str ());
gdb_flush (stream);
meter.printing = WORKING;
}
int width = chars_per_line - 3;
max = width * howmuch;
- fprintf_unfiltered (stream, "\r[");
+ gdb_printf (stream, "\r[");
for (i = 0; i < width; ++i)
- fprintf_unfiltered (stream, i < max ? "#" : " ");
- fprintf_unfiltered (stream, "]");
+ gdb_printf (stream, i < max ? "#" : " ");
+ gdb_printf (stream, "]");
gdb_flush (stream);
meter.printing = PROGRESS;
}
if (!stream->isatty ())
{
- fprintf_unfiltered (stream, "\n");
+ gdb_printf (stream, "\n");
gdb_flush (stream);
}
else if (meter.printing == PROGRESS)
int i;
int width = get_chars_per_line () - 3;
- fprintf_unfiltered (stream, "\r");
+ gdb_printf (stream, "\r");
for (i = 0; i < width + 2; ++i)
- fprintf_unfiltered (stream, " ");
- fprintf_unfiltered (stream, "\r");
+ gdb_printf (stream, " ");
+ gdb_printf (stream, "\r");
gdb_flush (stream);
}
void
cli_ui_out::field_separator ()
{
- if (test_flags (unfiltered_output))
- fputc_unfiltered (' ', m_streams.back ());
- else
- fputc_filtered (' ', m_streams.back ());
+ gdb_putc (' ', m_streams.back ());
}
/* Constructor for cli_ui_out. */
{
}
-/* Initialize private members at startup. */
-
-cli_ui_out *
-cli_out_new (struct ui_file *stream)
-{
- return new cli_ui_out (stream, ui_source_list);
-}
-
ui_file *
cli_ui_out::set_stream (struct ui_file *stream)
{