Remove cli_ui_out::out_field_fmt

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-24  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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bec33b60e446ccaccc75558b12f1c5a26862e8a1..7101934e7674f4f3cf7df1e32a827cf644eba496 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-24  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.
+
 2018-04-23  Tom Tromey  <tom@tromey.com>
 
        * guile/scm-frame.c (gdbscm_frame_read_var): Use

diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index 1679ed4bd22ea1916394affb1532fec7a45c824a..ad0a34ed39f025b8bb0e9b6079a8e71c65222620 100644 (file)
--- 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 b95c9987de9566e42a0f53cd63418e221c074e5d..adbd24445650fea4d06fca56513045ebe74cea2d 100644 (file)
--- 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;