espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-22 19:09:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove fputs_styled_unfiltered

Browse Source 
fputs_styled_unfiltered is only called from cli_ui_out, so remove it.
This area will be further simplified in future patches.
This commit is contained in:
Tom Tromey
2022-01-01 15:25:53 -07:00
parent 3cd5229387
commit f4bf8795b3
3 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gdb/cli-out.c
View File

@ -171,10 +171,13 @@ cli_ui_out::do_field_string (int fldno, int width, ui_align align,
if (string) if (string)
{ {
ui_file *stream = m_streams.back ();
stream->emit_style_escape (style);
if (test_flags (unfiltered_output)) if (test_flags (unfiltered_output))
fputs_styled_unfiltered (string, style, m_streams.back ()); stream->puts_unfiltered (string);
else else
fputs_styled (string, style, m_streams.back ()); stream->puts (string);
stream->emit_style_escape (ui_file_style ());
} }
if (after) if (after)
@ -233,10 +236,13 @@ cli_ui_out::do_message (const ui_file_style &style,
std::string str = string_vprintf (format, args); std::string str = string_vprintf (format, args);
if (!str.empty ()) if (!str.empty ())
{ {
ui_file *stream = m_streams.back ();
stream->emit_style_escape (style);
if (test_flags (unfiltered_output)) if (test_flags (unfiltered_output))
fputs_styled_unfiltered (str.c_str (), style, m_streams.back ()); stream->puts_unfiltered (str.c_str ());
else else
fputs_styled (str.c_str (), style, m_streams.back ()); stream->puts (str.c_str ());
stream->emit_style_escape (ui_file_style ());
} }
} }

11
gdb/utils.c
View File

@ -1762,17 +1762,6 @@ fputs_styled (const char *linebuffer, const ui_file_style &style,
/* See utils.h. */ /* 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 void
fputs_highlighted (const char *str, const compiled_regex &highlight, fputs_highlighted (const char *str, const compiled_regex &highlight,
struct ui_file *stream) struct ui_file *stream)

6
gdb/utils.h
View File

@ -296,12 +296,6 @@ extern void fputs_styled (const char *linebuffer,
const ui_file_style &style, const ui_file_style &style,
struct ui_file *stream); 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 /* Like fputs_styled, but uses highlight_style to highlight the
parts of STR that match HIGHLIGHT. */ parts of STR that match HIGHLIGHT. */