From 0e37c0638c15f7ed9215029d9185498ce2741603 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Sat, 1 Jan 2022 13:35:13 -0700
Subject: [PATCH] Remove vfprintf_styled_no_gdbfmt

This removes vfprintf_styled_no_gdbfmt, inlining it at the sole point
of call.
---
 gdb/cli-out.c | 13 ++++++++-----
 gdb/utils.c   | 15 ---------------
 gdb/utils.h   |  8 --------
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index b2daad11a51..a7fcc623897 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 8f479c487d3..57ce9ca5f4f 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 cd73af4651a..f2b23a9935e 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.  */
 
-- 
2.30.2