Unify gdb printf functions

Now that filtered and unfiltered output can be treated identically, we
can unify the printf family of functions.  This is done under the name
"gdb_printf".  Most of this patch was written by script.

1 files changed, 33 insertions, 33 deletions

diff --git a/gdb/regcache.c b/gdb/regcache.c
index 00d7a10..a5e83da 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -1383,34 +1383,34 @@ regcache::debug_print_register (const char *func,  int regno)
 {
   struct gdbarch *gdbarch = arch ();
 
-  fprintf_unfiltered (gdb_stdlog, "%s ", func);
+  gdb_printf (gdb_stdlog, "%s ", func);
   if (regno >= 0 && regno < gdbarch_num_regs (gdbarch)
       && gdbarch_register_name (gdbarch, regno) != NULL
       && gdbarch_register_name (gdbarch, regno)[0] != '\0')
-    fprintf_unfiltered (gdb_stdlog, "(%s)",
-			gdbarch_register_name (gdbarch, regno));
+    gdb_printf (gdb_stdlog, "(%s)",
+		gdbarch_register_name (gdbarch, regno));
   else
-    fprintf_unfiltered (gdb_stdlog, "(%d)", regno);
+    gdb_printf (gdb_stdlog, "(%d)", regno);
   if (regno >= 0 && regno < gdbarch_num_regs (gdbarch))
     {
       enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
       int size = register_size (gdbarch, regno);
       gdb_byte *buf = register_buffer (regno);
 
-      fprintf_unfiltered (gdb_stdlog, " = ");
+      gdb_printf (gdb_stdlog, " = ");
       for (int i = 0; i < size; i++)
 	{
-	  fprintf_unfiltered (gdb_stdlog, "%02x", buf[i]);
+	  gdb_printf (gdb_stdlog, "%02x", buf[i]);
 	}
       if (size <= sizeof (LONGEST))
 	{
 	  ULONGEST val = extract_unsigned_integer (buf, size, byte_order);
 
-	  fprintf_unfiltered (gdb_stdlog, " %s %s",
-			      core_addr_to_string_nz (val), plongest (val));
+	  gdb_printf (gdb_stdlog, " %s %s",
+		      core_addr_to_string_nz (val), plongest (val));
 	}
     }
-  fprintf_unfiltered (gdb_stdlog, "\n");
+  gdb_printf (gdb_stdlog, "\n");
 }
 
 /* Implement 'maint flush register-cache' command.  */
@@ -1421,7 +1421,7 @@ reg_flush_command (const char *command, int from_tty)
   /* Force-flush the register cache.  */
   registers_changed ();
   if (from_tty)
-    printf_filtered (_("Register cache flushed.\n"));
+    gdb_printf (_("Register cache flushed.\n"));
 }
 
 void
@@ -1441,7 +1441,7 @@ register_dump::dump (ui_file *file)
     {
       /* Name.  */
       if (regnum < 0)
-	fprintf_filtered (file, " %-10s", "Name");
+	gdb_printf (file, " %-10s", "Name");
       else
 	{
 	  const char *p = gdbarch_register_name (m_gdbarch, regnum);
@@ -1450,31 +1450,31 @@ register_dump::dump (ui_file *file)
 	    p = "";
 	  else if (p[0] == '\0')
 	    p = "''";
-	  fprintf_filtered (file, " %-10s", p);
+	  gdb_printf (file, " %-10s", p);
 	}
 
       /* Number.  */
       if (regnum < 0)
-	fprintf_filtered (file, " %4s", "Nr");
+	gdb_printf (file, " %4s", "Nr");
       else
-	fprintf_filtered (file, " %4d", regnum);
+	gdb_printf (file, " %4d", regnum);
 
       /* Relative number.  */
       if (regnum < 0)
-	fprintf_filtered (file, " %4s", "Rel");
+	gdb_printf (file, " %4s", "Rel");
       else if (regnum < gdbarch_num_regs (m_gdbarch))
-	fprintf_filtered (file, " %4d", regnum);
+	gdb_printf (file, " %4d", regnum);
       else
-	fprintf_filtered (file, " %4d",
-			  (regnum - gdbarch_num_regs (m_gdbarch)));
+	gdb_printf (file, " %4d",
+		    (regnum - gdbarch_num_regs (m_gdbarch)));
 
       /* Offset.  */
       if (regnum < 0)
-	fprintf_filtered (file, " %6s  ", "Offset");
+	gdb_printf (file, " %6s  ", "Offset");
       else
 	{
-	  fprintf_filtered (file, " %6ld",
-			    descr->register_offset[regnum]);
+	  gdb_printf (file, " %6ld",
+		      descr->register_offset[regnum]);
 	  if (register_offset != descr->register_offset[regnum]
 	      || (regnum > 0
 		  && (descr->register_offset[regnum]
@@ -1484,19 +1484,19 @@ register_dump::dump (ui_file *file)
 	    {
 	      if (!footnote_register_offset)
 		footnote_register_offset = ++footnote_nr;
-	      fprintf_filtered (file, "*%d", footnote_register_offset);
+	      gdb_printf (file, "*%d", footnote_register_offset);
 	    }
 	  else
-	    fprintf_filtered (file, "  ");
+	    gdb_printf (file, "  ");
 	  register_offset = (descr->register_offset[regnum]
 			     + descr->sizeof_register[regnum]);
 	}
 
       /* Size.  */
       if (regnum < 0)
-	fprintf_filtered (file, " %5s ", "Size");
+	gdb_printf (file, " %5s ", "Size");
       else
-	fprintf_filtered (file, " %5ld", descr->sizeof_register[regnum]);
+	gdb_printf (file, " %5ld", descr->sizeof_register[regnum]);
 
       /* Type.  */
       {
@@ -1522,24 +1522,24 @@ register_dump::dump (ui_file *file)
 	    if (startswith (t, blt))
 	      t += strlen (blt);
 	  }
-	fprintf_filtered (file, " %-15s", t);
+	gdb_printf (file, " %-15s", t);
       }
 
       /* Leading space always present.  */
-      fprintf_filtered (file, " ");
+      gdb_printf (file, " ");
 
       dump_reg (file, regnum);
 
-      fprintf_filtered (file, "\n");
+      gdb_printf (file, "\n");
     }
 
   if (footnote_register_offset)
-    fprintf_filtered (file, "*%d: Inconsistent register offsets.\n",
-		      footnote_register_offset);
+    gdb_printf (file, "*%d: Inconsistent register offsets.\n",
+		footnote_register_offset);
   if (footnote_register_type_name_null)
-    fprintf_filtered (file,
-		      "*%d: Register type's name NULL.\n",
-		      footnote_register_type_name_null);
+    gdb_printf (file,
+		"*%d: Register type's name NULL.\n",
+		footnote_register_type_name_null);
 }
 
 #if GDB_SELF_TEST