diff options
author | Tom Tromey <tom@tromey.com> | 2022-01-02 13:08:45 -0700 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2022-03-29 12:46:25 -0600 |
commit | 7e9e74b6a8ac919227fc4432e01745217665762b (patch) | |
tree | 506c6fb2540ba78b522164a4ea81a80616b815a7 | |
parent | bed009b9d8601de825ac848c543ee9853628940d (diff) | |
download | binutils-7e9e74b6a8ac919227fc4432e01745217665762b.zip binutils-7e9e74b6a8ac919227fc4432e01745217665762b.tar.gz binutils-7e9e74b6a8ac919227fc4432e01745217665762b.tar.bz2 |
Remove ui_out_flag::unfiltered_output
There is no longer any need for ui_out_flag::unfiltered_output --
nothing ever sets this flag. This used to be needed to make the
_unfiltered output work, but now only printf_unfiltered can be used,
and it uses the puts_unfiltered method. This patch removes the flag
and the dead code.
-rw-r--r-- | gdb/cli-out.c | 25 | ||||
-rw-r--r-- | gdb/ui-out.h | 5 |
2 files changed, 6 insertions, 24 deletions
diff --git a/gdb/cli-out.c b/gdb/cli-out.c index 39279d9..e0802df 100644 --- a/gdb/cli-out.c +++ b/gdb/cli-out.c @@ -173,10 +173,7 @@ cli_ui_out::do_field_string (int fldno, int width, ui_align align, { 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 ()); } @@ -208,10 +205,7 @@ cli_ui_out::do_spaces (int numspaces) if (m_suppress_output) return; - if (test_flags (unfiltered_output)) - gdb_printf (m_streams.back (), "%*s", numspaces, ""); - else - print_spaces (numspaces, m_streams.back ()); + print_spaces (numspaces, m_streams.back ()); } void @@ -220,10 +214,7 @@ cli_ui_out::do_text (const char *string) 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 @@ -238,10 +229,7 @@ cli_ui_out::do_message (const ui_file_style &style, { 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 ()); } } @@ -380,10 +368,7 @@ cli_ui_out::do_progress_end () void cli_ui_out::field_separator () { - if (test_flags (unfiltered_output)) - gdb_putc (' ', m_streams.back ()); - else - gdb_putc (' ', m_streams.back ()); + gdb_putc (' ', m_streams.back ()); } /* Constructor for cli_ui_out. */ diff --git a/gdb/ui-out.h b/gdb/ui-out.h index cd36211..9e6ff9a 100644 --- a/gdb/ui-out.h +++ b/gdb/ui-out.h @@ -53,12 +53,9 @@ enum ui_out_flag { ui_source_list = (1 << 0), fix_multi_location_breakpoint_output = (1 << 1), - /* For CLI output, this flag is set if unfiltered output is desired. - This should only be used by low-level formatting functions. */ - unfiltered_output = (1 << 2), /* This indicates that %pF should be disallowed in a printf format string. */ - disallow_ui_out_field = (1 << 3) + disallow_ui_out_field = (1 << 2) }; DEF_ENUM_FLAGS_TYPE (ui_out_flag, ui_out_flags); |