From da5bd37ebc6d9816be970d8a668a6a04508774c8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 11 Feb 2020 07:05:28 -0700 Subject: Remove some ui_file_* functions 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 * 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 --- gdb/tui/tui-interp.c | 2 +- gdb/tui/tui.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gdb/tui') diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c index 978b502..090cf0e 100644 --- a/gdb/tui/tui-interp.c +++ b/gdb/tui/tui-interp.c @@ -243,7 +243,7 @@ tui_interp::init (bool top_level) tui_initialize_io (); tui_initialize_win (); - if (ui_file_isatty (gdb_stdout)) + if (gdb_stdout->isatty ()) tui_initialize_readline (); } diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index ae3b9f6..0a59837 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -425,7 +425,7 @@ tui_enable (void) /* Don't try to setup curses (and print funny control characters) if we're not outputting to a terminal. */ - if (!ui_file_isatty (gdb_stdout)) + if (!gdb_stderr->isatty ()) error (_("Cannot enable the TUI when output is not a terminal")); s = newterm (NULL, stdout, stdin); -- cgit v1.1