diff options
| author | Tom Tromey <tom@tromey.com> | 2022-01-01 15:25:53 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2022-03-29 12:46:24 -0600 |
| commit | f4bf8795b382327001cf467b855e5dcd6f30fe5d (patch) | |
| tree | 5c45496cfe227633afd8488223c6b3217be58830 | |
| parent | 3cd5229387926dbd2fe842328e7d923bbb41322c (diff) | |
| download | fsf-binutils-gdb-f4bf8795b382327001cf467b855e5dcd6f30fe5d.zip fsf-binutils-gdb-f4bf8795b382327001cf467b855e5dcd6f30fe5d.tar.gz fsf-binutils-gdb-f4bf8795b382327001cf467b855e5dcd6f30fe5d.tar.bz2 | |
Remove fputs_styled_unfiltered
fputs_styled_unfiltered is only called from cli_ui_out, so remove it.
This area will be further simplified in future patches.
| -rw-r--r-- | gdb/cli-out.c | 14 | ||||
| -rw-r--r-- | gdb/utils.c | 11 | ||||
| -rw-r--r-- | gdb/utils.h | 6 |
3 files changed, 10 insertions, 21 deletions
diff --git a/gdb/cli-out.c b/gdb/cli-out.c index a7fcc62..f6a5083 100644 --- a/gdb/cli-out.c +++ b/gdb/cli-out.c @@ -171,10 +171,13 @@ cli_ui_out::do_field_string (int fldno, int width, ui_align align, if (string) { + ui_file *stream = m_streams.back (); + stream->emit_style_escape (style); if (test_flags (unfiltered_output)) - fputs_styled_unfiltered (string, style, m_streams.back ()); + stream->puts_unfiltered (string); else - fputs_styled (string, style, m_streams.back ()); + stream->puts (string); + stream->emit_style_escape (ui_file_style ()); } if (after) @@ -233,10 +236,13 @@ cli_ui_out::do_message (const ui_file_style &style, std::string str = string_vprintf (format, args); if (!str.empty ()) { + ui_file *stream = m_streams.back (); + stream->emit_style_escape (style); if (test_flags (unfiltered_output)) - fputs_styled_unfiltered (str.c_str (), style, m_streams.back ()); + stream->puts_unfiltered (str.c_str ()); else - fputs_styled (str.c_str (), style, m_streams.back ()); + stream->puts (str.c_str ()); + stream->emit_style_escape (ui_file_style ()); } } diff --git a/gdb/utils.c b/gdb/utils.c index 70b2660..a86d2c4 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1763,17 +1763,6 @@ fputs_styled (const char *linebuffer, const ui_file_style &style, /* See utils.h. */ void -fputs_styled_unfiltered (const char *linebuffer, const ui_file_style &style, - struct ui_file *stream) -{ - stream->emit_style_escape (style); - stream->puts_unfiltered (linebuffer); - stream->emit_style_escape (ui_file_style ()); -} - -/* See utils.h. */ - -void fputs_highlighted (const char *str, const compiled_regex &highlight, struct ui_file *stream) { diff --git a/gdb/utils.h b/gdb/utils.h index c9c4613..e721b45 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -296,12 +296,6 @@ extern void fputs_styled (const char *linebuffer, const ui_file_style &style, struct ui_file *stream); -/* Unfiltered variant of fputs_styled. */ - -extern void fputs_styled_unfiltered (const char *linebuffer, - const ui_file_style &style, - struct ui_file *stream); - /* Like fputs_styled, but uses highlight_style to highlight the parts of STR that match HIGHLIGHT. */ |