Remove ui_file::reset_style

ui_file::reset_style doesn't seem to be needed.  This patch removes
it.  Regression tested on x86-64 Fedora 40.
This commit is contained in:
Tom Tromey
2025-04-09 17:34:10 -06:00
parent dadaf42c65
commit 067bb42419
6 changed files with 2 additions and 44 deletions

View File

@@ -833,7 +833,7 @@ echo_command (const char *text, int from_tty)
gdb_printf ("%c", c);
}
gdb_stdout->reset_style ();
gdb_stdout->emit_style_escape (ui_file_style ());
/* Force this output to appear now. */
gdb_flush (gdb_stdout);

View File

@@ -50,7 +50,6 @@ public:
}
void emit_style_escape (const ui_file_style &style) override;
void reset_style () override;
void flush () override;

View File

@@ -2883,7 +2883,7 @@ static void
printf_command (const char *arg, int from_tty)
{
ui_printf (arg, gdb_stdout);
gdb_stdout->reset_style ();
gdb_stdout->emit_style_escape (ui_file_style ());
gdb_stdout->wrap_here (0);
gdb_stdout->flush ();
}

View File

@@ -87,18 +87,6 @@ ui_file::emit_style_escape (const ui_file_style &style)
/* See ui-file.h. */
void
ui_file::reset_style ()
{
if (can_emit_style_escape ())
{
m_applied_style = ui_file_style ();
this->puts (m_applied_style.to_ansi ().c_str ());
}
}
/* See ui-file.h. */
void
ui_file::printchar (int c, int quoter, bool async_safe)
{

View File

@@ -123,9 +123,6 @@ public:
/* Emit an ANSI style escape for STYLE. */
virtual void emit_style_escape (const ui_file_style &style);
/* Rest the current output style to the empty style. */
virtual void reset_style ();
/* Print STR, bypassing any paging that might be done by this
ui_file. Note that nearly no code should call this -- it's
intended for use by gdb_printf, but nothing else. */
@@ -353,12 +350,6 @@ public:
m_two->emit_style_escape (style);
}
void reset_style () override
{
m_one->reset_style ();
m_two->reset_style ();
}
void puts_unfiltered (const char *str) override
{
m_one->puts_unfiltered (str);
@@ -389,10 +380,6 @@ public:
void emit_style_escape (const ui_file_style &style) override
{
}
void reset_style () override
{
}
};
/* A base class for ui_file types that wrap another ui_file. */
@@ -419,10 +406,6 @@ public:
void emit_style_escape (const ui_file_style &style) override
{ m_stream->emit_style_escape (style); }
/* Rest the current output style to the empty style. */
void reset_style () override
{ m_stream->reset_style (); }
int fd () const override
{ return m_stream->fd (); }

View File

@@ -1407,18 +1407,6 @@ pager_file::emit_style_escape (const ui_file_style &style)
}
}
/* See pager.h. */
void
pager_file::reset_style ()
{
if (can_emit_style_escape ())
{
m_applied_style = ui_file_style ();
m_wrap_buffer.append (m_applied_style.to_ansi ());
}
}
/* Wait, so the user can read what's on the screen. Prompt the user
to continue by pressing RETURN. 'q' is also provided because
telling users what to do in the prompt is more user-friendly than