Consistently Use ui_file parameter to show callbacks

I happened to notice that one "show" callback was printing to
gdb_stdout rather than to the passed-in ui_file parameter.  I went
through all such callbacks and fixed them to consistently use the
ui_file.

Regression tested on x86-64 Fedora 34.

diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index 124d15c60cfc7edea8ca582141abb5908e72c2d1..bad4d1a22e923a8d09ed26ddce9aeeb2986a789c 100644 (file)
--- a/gdb/cli/cli-logging.c
+++ b/gdb/cli/cli-logging.c
@@ -181,9 +181,9 @@ show_logging_enabled (struct ui_file *file, int from_tty,
                       struct cmd_list_element *c, const char *value)
 {
   if (logging_enabled)
-    printf_unfiltered (_("Logging is enabled.\n"));
+    fprintf_unfiltered (file, _("Logging is enabled.\n"));
   else
-    printf_unfiltered (_("Logging is disabled.\n"));
+    fprintf_unfiltered (file, _("Logging is disabled.\n"));
 }
 
 void _initialize_cli_logging ();

diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c
index 1f160e297147339b6138766fab8bc7e627f2bb17..633cfdb6aea76efc0124cbb3439e771b8431a5e2 100644 (file)
--- a/gdb/debuginfod-support.c
+++ b/gdb/debuginfod-support.c
@@ -299,8 +299,9 @@ static void
 show_debuginfod_enabled (ui_file *file, int from_tty, cmd_list_element *cmd,
                         const char *value)
 {
-  printf_unfiltered (_("Debuginfod functionality is currently set to "
-                      "\"%s\".\n"), debuginfod_enabled);
+  fprintf_unfiltered (file,
+                     _("Debuginfod functionality is currently set to "
+                       "\"%s\".\n"), debuginfod_enabled);
 }
 
 /* Set callback for "set debuginfod urls".  */

diff --git a/gdb/exec.c b/gdb/exec.c
index 1be51474b4adc590a2246554a3745e24c8f5f70b..3d4cbdfcf45b5238554500b7aa5cdfe566f2fae5 100644 (file)
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -102,7 +102,7 @@ static void
 show_exec_file_mismatch_command (struct ui_file *file, int from_tty,
                                 struct cmd_list_element *c, const char *value)
 {
-  fprintf_filtered (gdb_stdout,
+  fprintf_filtered (file,
                    _("exec-file-mismatch handling is currently \"%s\".\n"),
                    exec_file_mismatch_names[exec_file_mismatch_mode]);
 }

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index a3752cc92852abf2c5997a47685ba8f8a53b05f1..d00a70c4361d26c106c3604d28c23843a4a6175a 100644 (file)
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -117,7 +117,7 @@ show_inferior_tty_command (struct ui_file *file, int from_tty,
      directly.  */
   const std::string &inferior_tty = current_inferior ()->tty ();
 
-  fprintf_filtered (gdb_stdout,
+  fprintf_filtered (file,
                    _("Terminal for future runs of program being debugged "
                      "is \"%s\".\n"), inferior_tty.c_str ());
 }
@@ -177,13 +177,13 @@ show_cwd_command (struct ui_file *file, int from_tty,
   const std::string &cwd = current_inferior ()->cwd ();
 
   if (cwd.empty ())
-    fprintf_filtered (gdb_stdout,
+    fprintf_filtered (file,
                      _("\
 You have not set the inferior's current working directory.\n\
 The inferior will inherit GDB's cwd if native debugging, or the remote\n\
 server's cwd if remote debugging.\n"));
   else
-    fprintf_filtered (gdb_stdout,
+    fprintf_filtered (file,
                      _("Current working directory that will be used "
                        "when starting the inferior is \"%s\".\n"),
                      cwd.c_str ());

diff --git a/gdb/language.c b/gdb/language.c
index 3e60a668ed61097ed910a3ea157bac05c6859c70..c4068ec446e27374040e6a0bb48d22b9c78e5b05 100644 (file)
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -114,12 +114,12 @@ show_language_command (struct ui_file *file, int from_tty,
   enum language flang;         /* The language of the frame.  */
 
   if (language_mode == language_mode_auto)
-    fprintf_filtered (gdb_stdout,
+    fprintf_filtered (file,
                      _("The current source language is "
                        "\"auto; currently %s\".\n"),
                      current_language->name ());
   else
-    fprintf_filtered (gdb_stdout,
+    fprintf_filtered (file,
                      _("The current source language is \"%s\".\n"),
                      current_language->name ());
 
@@ -132,7 +132,7 @@ show_language_command (struct ui_file *file, int from_tty,
       if (flang != language_unknown
          && language_mode == language_mode_manual
          && current_language->la_language != flang)
-       printf_filtered ("%s\n", _(lang_frame_mismatch_warn));
+       fprintf_filtered (file, "%s\n", _(lang_frame_mismatch_warn));
     }
 }
 
@@ -220,12 +220,12 @@ show_range_command (struct ui_file *file, int from_tty,
                          "Unrecognized range check setting.");
        }
 
-      fprintf_filtered (gdb_stdout,
+      fprintf_filtered (file,
                        _("Range checking is \"auto; currently %s\".\n"),
                        tmp);
     }
   else
-    fprintf_filtered (gdb_stdout, _("Range checking is \"%s\".\n"),
+    fprintf_filtered (file, _("Range checking is \"%s\".\n"),
                      value);
 
   if (range_check == range_check_warn
@@ -296,13 +296,13 @@ show_case_command (struct ui_file *file, int from_tty,
                          "Unrecognized case-sensitive setting.");
        }
 
-      fprintf_filtered (gdb_stdout,
+      fprintf_filtered (file,
                        _("Case sensitivity in "
                          "name search is \"auto; currently %s\".\n"),
                        tmp);
     }
   else
-    fprintf_filtered (gdb_stdout,
+    fprintf_filtered (file,
                      _("Case sensitivity in name search is \"%s\".\n"),
                      value);
 

diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 603c5d2664b39ebafa8a8cdafae2c2ca8411b110..d30487ae87b1b3727956c668ab66605de3110cd5 100644 (file)
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -1190,14 +1190,15 @@ show_mask_address (struct ui_file *file, int from_tty,
   switch (mask_address_var)
     {
     case AUTO_BOOLEAN_TRUE:
-      printf_filtered ("The 32 bit mips address mask is enabled\n");
+      fprintf_filtered (file, "The 32 bit mips address mask is enabled\n");
       break;
     case AUTO_BOOLEAN_FALSE:
-      printf_filtered ("The 32 bit mips address mask is disabled\n");
+      fprintf_filtered (file, "The 32 bit mips address mask is disabled\n");
       break;
     case AUTO_BOOLEAN_AUTO:
-      printf_filtered
-       ("The 32 bit address mask is set automatically.  Currently %s\n",
+      fprintf_filtered
+       (file,
+        "The 32 bit address mask is set automatically.  Currently %s\n",
         mips_mask_address_p (tdep) ? "enabled" : "disabled");
       break;
     default:

diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index a6ce3db64e57d8e857ad092c19b537f4dac4fa34..b2f07cb1870cd580b8d85c0a726a9b0f2fab5992 100644 (file)
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -2956,7 +2956,7 @@ static void
 cmd_show_replay_memory_access (struct ui_file *file, int from_tty,
                               struct cmd_list_element *c, const char *value)
 {
-  fprintf_filtered (gdb_stdout, _("Replay memory access is %s.\n"),
+  fprintf_filtered (file, _("Replay memory access is %s.\n"),
                    replay_memory_access);
 }
 

diff --git a/gdb/remote.c b/gdb/remote.c
index 46cd352ef90594acff470d4b2f4adbe3b542a623..78573d945d4c105d54898405ad191cb2d9be09a1 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -1065,8 +1065,6 @@ static int stub_unpack_int (const char *buff, int fieldlength);
 
 struct packet_config;
 
-static void show_packet_config_cmd (struct packet_config *config);
-
 static void show_remote_protocol_packet_cmd (struct ui_file *file,
                                             int from_tty,
                                             struct cmd_list_element *c,
@@ -1913,7 +1911,7 @@ static enum packet_support packet_config_support (struct packet_config *config);
 static enum packet_support packet_support (int packet);
 
 static void
-show_packet_config_cmd (struct packet_config *config)
+show_packet_config_cmd (ui_file *file, struct packet_config *config)
 {
   const char *support = "internal-error";
 
@@ -1932,14 +1930,16 @@ show_packet_config_cmd (struct packet_config *config)
   switch (config->detect)
     {
     case AUTO_BOOLEAN_AUTO:
-      printf_filtered (_("Support for the `%s' packet "
-                        "is auto-detected, currently %s.\n"),
-                      config->name, support);
+      fprintf_filtered (file,
+                       _("Support for the `%s' packet "
+                         "is auto-detected, currently %s.\n"),
+                       config->name, support);
       break;
     case AUTO_BOOLEAN_TRUE:
     case AUTO_BOOLEAN_FALSE:
-      printf_filtered (_("Support for the `%s' packet is currently %s.\n"),
-                      config->name, support);
+      fprintf_filtered (file,
+                       _("Support for the `%s' packet is currently %s.\n"),
+                       config->name, support);
       break;
     }
 }
@@ -2275,7 +2275,7 @@ show_remote_protocol_packet_cmd (struct ui_file *file, int from_tty,
     {
       if (c == packet->show_cmd)
        {
-         show_packet_config_cmd (packet);
+         show_packet_config_cmd (file, packet);
          return;
        }
     }
@@ -2319,7 +2319,7 @@ show_remote_protocol_Z_packet_cmd (struct ui_file *file, int from_tty,
 
   for (i = 0; i < NR_Z_PACKET_TYPES; i++)
     {
-      show_packet_config_cmd (&remote_protocol_packets[PACKET_Z0 + i]);
+      show_packet_config_cmd (file, &remote_protocol_packets[PACKET_Z0 + i]);
     }
 }
 

diff --git a/gdb/source.c b/gdb/source.c
index 44e90bfab73a683f0b4373d3fc2f838f4a0a7117..f2f116091b3b9cf6a721900b1f2f0466312cc87e 100644 (file)
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -400,11 +400,11 @@ set_directories_command (const char *args,
    function.  */
 
 static void
-show_directories_1 (char *ignore, int from_tty)
+show_directories_1 (ui_file *file, char *ignore, int from_tty)
 {
-  puts_filtered ("Source directories searched: ");
-  puts_filtered (source_path.c_str ());
-  puts_filtered ("\n");
+  fputs_filtered ("Source directories searched: ", file);
+  fputs_filtered (source_path.c_str (), file);
+  fputs_filtered ("\n", file);
 }
 
 /* Handler for "show directories" command.  */
@@ -413,7 +413,7 @@ static void
 show_directories_command (struct ui_file *file, int from_tty,
                          struct cmd_list_element *c, const char *value)
 {
-  show_directories_1 (NULL, from_tty);
+  show_directories_1 (file, NULL, from_tty);
 }
 
 /* See source.h.  */
@@ -485,7 +485,7 @@ directory_command (const char *dirname, int from_tty)
       gdb::observers::command_param_changed.notify ("directories",
                                                    source_path.c_str ());
       if (from_tty)
-       show_directories_1 ((char *) 0, from_tty);
+       show_directories_1 (gdb_stdout, (char *) 0, from_tty);
     }
 }
 

diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index de1d68c0164783a7bd09bbf877b6abacc5239de2..ffbfe3559497a6bd1efb9effb91dbeab3237f01d 100644 (file)
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -1303,11 +1303,13 @@ show_tdesc_filename_cmd (struct ui_file *file, int from_tty,
   value = get_tdesc_info (current_inferior ())->filename.data ();
 
   if (value != NULL && *value != '\0')
-    printf_filtered (_("The target description will be read from \"%s\".\n"),
-                    value);
+    fprintf_filtered (file,
+                     _("The target description will be read from \"%s\".\n"),
+                     value);
   else
-    printf_filtered (_("The target description will be "
-                      "read from the target.\n"));
+    fprintf_filtered (file,
+                     _("The target description will be "
+                       "read from the target.\n"));
 }
 
 static void

diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 8462d1eb1dae1ca43d712d6676d738b30e461f87..d92c5fcad18ae434d75e30f32afe4636f1c27ac3 100644 (file)
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -790,7 +790,7 @@ static void
 tui_show_tab_width (struct ui_file *file, int from_tty,
                    struct cmd_list_element *c, const char *value)
 {
-  fprintf_filtered (gdb_stdout, _("TUI tab width is %s spaces.\n"), value);
+  fprintf_filtered (file, _("TUI tab width is %s spaces.\n"), value);
 
 }
 
@@ -814,7 +814,7 @@ static void
 tui_show_compact_source (struct ui_file *file, int from_tty,
                         struct cmd_list_element *c, const char *value)
 {
-  printf_filtered (_("TUI source window compactness is %s.\n"), value);
+  fprintf_filtered (file, _("TUI source window compactness is %s.\n"), value);
 }
 
 /* Set the tab width of the specified window.  */