[RFA,1/2] Remove cli_ui_out::out_field_fmt

Message ID 20180423153255.12634-2-tom@tromey.com
State New
Headers show
Series
  • Two trivial cli-out patches
Related show

Commit Message

Tom Tromey April 23, 2018, 3:32 p.m.
I noticed that cli_ui_out::out_field_fmt is only used by a single
caller, and it can easily be replaced by fputs_filtered.  So, this
patch removes it.

ChangeLog
2018-04-22  Tom Tromey  <tom@tromey.com>

	* cli-out.c (cli_ui_out::out_field_fmt): Remove.
	(cli_ui_out::do_field_string): Use fputs_filtered.
	* cli-out.h (class cli_ui_out) <out_field_fmt>: Remove.
---
 gdb/ChangeLog |  6 ++++++
 gdb/cli-out.c | 18 +-----------------
 gdb/cli-out.h |  2 --
 3 files changed, 7 insertions(+), 19 deletions(-)

-- 
2.13.6

Patch

diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index 1679ed4bd2..ad0a34ed39 100644
--- a/gdb/cli-out.c
+++ b/gdb/cli-out.c
@@ -156,7 +156,7 @@  cli_ui_out::do_field_string (int fldno, int width, ui_align align,
     spaces (before);
 
   if (string)
-    out_field_fmt (fldno, fldname, "%s", string);
+    fputs_filtered (string, m_streams.back ());
 
   if (after)
     spaces (after);
@@ -238,22 +238,6 @@  cli_ui_out::do_redirect (ui_file *outstream)
 
 /* local functions */
 
-/* Like cli_ui_out::do_field_fmt, but takes a variable number of args
-   and makes a va_list and does not insert a separator.  */
-
-/* VARARGS */
-void
-cli_ui_out::out_field_fmt (int fldno, const char *fldname,
-			   const char *format, ...)
-{
-  va_list args;
-
-  va_start (args, format);
-  vfprintf_filtered (m_streams.back (), format, args);
-
-  va_end (args);
-}
-
 void
 cli_ui_out::field_separator ()
 {
diff --git a/gdb/cli-out.h b/gdb/cli-out.h
index b95c9987de..adbd244456 100644
--- a/gdb/cli-out.h
+++ b/gdb/cli-out.h
@@ -68,8 +68,6 @@  protected:
 private:
 
   void field_separator ();
-  void out_field_fmt (int fldno, const char *fldname, const char *format, ...)
-    ATTRIBUTE_PRINTF (4, 5);
 
   std::vector<ui_file *> m_streams;
   bool m_suppress_output;