diff options
| author | Tom Tromey <tom@tromey.com> | 2022-01-01 13:35:13 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2022-03-29 12:46:24 -0600 |
| commit | 0e37c0638c15f7ed9215029d9185498ce2741603 (patch) | |
| tree | c7942993dd96dac29778bab96e00c74ac9f89823 /gdb | |
| parent | c8d74a7b4b341f7498a3827555451924cabdd0f1 (diff) | |
| download | gdb-0e37c0638c15f7ed9215029d9185498ce2741603.zip gdb-0e37c0638c15f7ed9215029d9185498ce2741603.tar.gz gdb-0e37c0638c15f7ed9215029d9185498ce2741603.tar.bz2 | |
Remove vfprintf_styled_no_gdbfmt
This removes vfprintf_styled_no_gdbfmt, inlining it at the sole point
of call.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/cli-out.c | 13 | ||||
| -rw-r--r-- | gdb/utils.c | 15 | ||||
| -rw-r--r-- | gdb/utils.h | 8 |
3 files changed, 8 insertions, 28 deletions
diff --git a/gdb/cli-out.c b/gdb/cli-out.c index b2daad1..a7fcc62 100644 --- a/gdb/cli-out.c +++ b/gdb/cli-out.c @@ -230,11 +230,14 @@ cli_ui_out::do_message (const ui_file_style &style, if (m_suppress_output) return; - /* Use the "no_gdbfmt" variant here to avoid recursion. - vfprintf_styled calls into cli_ui_out::message to handle the - gdb-specific printf formats. */ - vfprintf_styled_no_gdbfmt (m_streams.back (), style, - !test_flags (unfiltered_output), format, args); + std::string str = string_vprintf (format, args); + if (!str.empty ()) + { + if (test_flags (unfiltered_output)) + fputs_styled_unfiltered (str.c_str (), style, m_streams.back ()); + else + fputs_styled (str.c_str (), style, m_streams.back ()); + } } void diff --git a/gdb/utils.c b/gdb/utils.c index 8f479c4..57ce9ca 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1993,21 +1993,6 @@ vfprintf_styled (struct ui_file *stream, const ui_file_style &style, set_output_style (stream, ui_file_style ()); } -/* See utils.h. */ - -void -vfprintf_styled_no_gdbfmt (struct ui_file *stream, const ui_file_style &style, - bool filter, const char *format, va_list args) -{ - std::string str = string_vprintf (format, args); - if (!str.empty ()) - { - set_output_style (stream, style); - fputs_maybe_filtered (str.c_str (), stream, filter); - set_output_style (stream, ui_file_style ()); - } -} - void printf_filtered (const char *format, ...) { diff --git a/gdb/utils.h b/gdb/utils.h index cd73af4..f2b23a9 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -289,14 +289,6 @@ extern void vfprintf_styled (struct ui_file *stream, va_list args) ATTRIBUTE_PRINTF (3, 0); -/* Like vfprintf_styled, but do not process gdb-specific format - specifiers. */ -extern void vfprintf_styled_no_gdbfmt (struct ui_file *stream, - const ui_file_style &style, - bool filter, - const char *fmt, va_list args) - ATTRIBUTE_PRINTF (4, 0); - /* Like fputs_filtered, but styles the output according to STYLE, when appropriate. */ |