FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some ui_file_* functions

Browse source 
This removes ui_file_isatty, ui_file_read, ui_file_write,
ui_file_write_async_safe, ui_file_flush, and ui_file_puts, replacing
them with calls to the appropriate method instead.

gdb/ChangeLog
2020-02-11  Tom Tromey  <tromey@adacore.com>

	* remote.c (remote_console_output): Update.
	* printcmd.c (printf_command): Update.
	* event-loop.c (gdb_wait_for_event): Update.
	* linux-nat.c (sigchld_handler): Update.
	* remote-sim.c (gdb_os_write_stdout): Update.
	(gdb_os_flush_stdout): Update.
	(gdb_os_flush_stderr): Update.
	(gdb_os_write_stderr): Update.
	* exceptions.c (print_exception): Update.
	* remote-fileio.c (remote_fileio_func_read): Update.
	(remote_fileio_func_write): Update.
	* tui/tui.c (tui_enable): Update.
	* tui/tui-interp.c (tui_interp::init): Update.
	* utils.c (init_page_info): Update.
	(putchar_unfiltered, fputc_unfiltered): Update.
	(gdb_flush): Update.
	(emit_style_escape): Update.
	(flush_wrap_buffer, fputs_maybe_filtered): Update.
	* ui-file.c (ui_file_isatty, ui_file_read, ui_file_write)
	(ui_file_write_async_safe, ui_file_flush, ui_file_puts): Remove.
	(stderr_file::write): Update.
	(stderr_file::puts): Update.
	* ui-file.h (ui_file_isatty, ui_file_write)
	(ui_file_write_async_safe, ui_file_read, ui_file_flush)
	(ui_file_puts): Don't declare.

Change-Id: I3ca9b36e9107f6adbc41e014f5078b41d6bcec4d
This commit is contained in:
Tom Tromey 2020-02-11 07:05:28 -07:00
parent c675ec1e76
commit da5bd37ebc
14 changed files with 59 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gdb/utils.c
View file

@ -1277,7 +1277,7 @@ init_page_info (void)
}
/* If the output is not a terminal, don't paginate it. */
if (!ui_file_isatty (gdb_stdout))
if (!gdb_stdout->isatty ())
lines_per_page = UINT_MAX;
#endif
}
@ -1405,7 +1405,7 @@ emit_style_escape (const ui_file_style &style,
if (stream == nullptr)
wrap_buffer.append (style.to_ansi ());
else
ui_file_puts (stream, style.to_ansi ().c_str ());
stream->puts (style.to_ansi ().c_str ());
}
/* Set the current output style. This will affect future uses of the
@ -1539,7 +1539,7 @@ flush_wrap_buffer (struct ui_file *stream)
{
if (stream == gdb_stdout && !wrap_buffer.empty ())
{
ui_file_puts (stream, wrap_buffer.c_str ());
stream->puts (wrap_buffer.c_str ());
wrap_buffer.clear ();
}
}
@ -1550,7 +1550,7 @@ void
gdb_flush (struct ui_file *stream)
{
flush_wrap_buffer (stream);
ui_file_flush (stream);
stream->flush ();
}
/* Indicate that if the next sequence of characters overflows the line,
@ -1697,7 +1697,7 @@ fputs_maybe_filtered (const char *linebuffer, struct ui_file *stream,
|| top_level_interpreter ()->interp_ui_out ()->is_mi_like_p ())
{
flush_wrap_buffer (stream);
ui_file_puts (stream, linebuffer);
stream->puts (linebuffer);
return;
}
@ -1797,7 +1797,7 @@ fputs_maybe_filtered (const char *linebuffer, struct ui_file *stream,
/* Now output indentation and wrapped string. */
if (wrap_column)
{
ui_file_puts (stream, wrap_indent);
stream->puts (wrap_indent);
if (stream->can_emit_style_escape ())
emit_style_escape (save_style, stream);
/* FIXME, this strlen is what prevents wrap_indent from
@ -1918,7 +1918,7 @@ putchar_unfiltered (int c)
{
char buf = c;
ui_file_write (gdb_stdout, &buf, 1);
gdb_stdout->write (&buf, 1);
return c;
}
@ -1936,7 +1936,7 @@ fputc_unfiltered (int c, struct ui_file *stream)
{
char buf = c;
ui_file_write (stream, &buf, 1);
stream->write (&buf, 1);
return c;
}