Remove vfprintf_styled_no_gdbfmt

This removes vfprintf_styled_no_gdbfmt, inlining it at the sole point
of call.

diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index b2daad11a51bda0d56f22508c28a5000926ceacc..a7fcc6238975e94c9bfe750cb663244a45cde66a 100644 (file)
--- 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 8f479c487d349a982c97b9260a056a7d58eeb4ce..57ce9ca5f4fb640cde1b0f3db327b2a26cdec620 100644 (file)
--- 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 cd73af4651a78ba056653da59c0f3643ece237a0..f2b23a9935e407e7fb94adf1a9a493d353a175cb 100644 (file)
--- 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.  */