From 3de0d96078193276795b9bdf72a25b77b60d8337 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Wed, 29 Dec 2021 11:05:51 -0700
Subject: [PATCH] Use filtered output in show callbacks

"show" command callbacks, like most ordinary gdb commands, should use
filtered output.  I found a few that did not, so this patch changes
them to use the filtered form.
---
 gdb/arch-utils.c         | 16 ++++++++--------
 gdb/arm-tdep.c           |  2 +-
 gdb/cli/cli-logging.c    |  4 ++--
 gdb/debuginfod-support.c |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index fb92b993c78..63c3c6cce72 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -375,18 +375,18 @@ show_endian (struct ui_file *file, int from_tty, struct cmd_list_element *c,
 {
   if (target_byte_order_user == BFD_ENDIAN_UNKNOWN)
     if (gdbarch_byte_order (get_current_arch ()) == BFD_ENDIAN_BIG)
-      fprintf_unfiltered (file, _("The target endianness is set automatically "
-				  "(currently big endian).\n"));
+      fprintf_filtered (file, _("The target endianness is set automatically "
+				"(currently big endian).\n"));
     else
-      fprintf_unfiltered (file, _("The target endianness is set automatically "
-				  "(currently little endian).\n"));
+      fprintf_filtered (file, _("The target endianness is set automatically "
+				"(currently little endian).\n"));
   else
     if (target_byte_order_user == BFD_ENDIAN_BIG)
-      fprintf_unfiltered (file,
-			  _("The target is set to big endian.\n"));
+      fprintf_filtered (file,
+			_("The target is set to big endian.\n"));
     else
-      fprintf_unfiltered (file,
-			  _("The target is set to little endian.\n"));
+      fprintf_filtered (file,
+			_("The target is set to little endian.\n"));
 }
 
 static void
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index e4af38ce8b4..1068a0c0c9b 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -8623,7 +8623,7 @@ show_disassembly_style_sfunc (struct ui_file *file, int from_tty,
 	len = strcspn (style, ",");
       }
 
-  fprintf_unfiltered (file, "The disassembly style is \"%.*s\".\n", len, style);
+  fprintf_filtered (file, "The disassembly style is \"%.*s\".\n", len, style);
 }
 
 /* Return the ARM register name corresponding to register I.  */
diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index bad4d1a22e9..9afd51e352a 100644
--- 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)
-    fprintf_unfiltered (file, _("Logging is enabled.\n"));
+    fprintf_filtered (file, _("Logging is enabled.\n"));
   else
-    fprintf_unfiltered (file, _("Logging is disabled.\n"));
+    fprintf_filtered (file, _("Logging is disabled.\n"));
 }
 
 void _initialize_cli_logging ();
diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c
index 633cfdb6aea..85abd721ac3 100644
--- a/gdb/debuginfod-support.c
+++ b/gdb/debuginfod-support.c
@@ -299,9 +299,9 @@ static void
 show_debuginfod_enabled (ui_file *file, int from_tty, cmd_list_element *cmd,
 			 const char *value)
 {
-  fprintf_unfiltered (file,
-		      _("Debuginfod functionality is currently set to "
-			"\"%s\".\n"), debuginfod_enabled);
+  fprintf_filtered (file,
+		    _("Debuginfod functionality is currently set to "
+		      "\"%s\".\n"), debuginfod_enabled);
 }
 
 /* Set callback for "set debuginfod urls".  */
@@ -342,7 +342,7 @@ show_debuginfod_urls (ui_file *file, int from_tty, cmd_list_element *cmd,
 		      const char *value)
 {
   if (value[0] == '\0')
-    fprintf_unfiltered (file, _("Debuginfod URLs have not been set.\n"));
+    fprintf_filtered (file, _("Debuginfod URLs have not been set.\n"));
   else
     fprintf_filtered (file, _("Debuginfod URLs are currently set to:\n%s\n"),
 		      value);
-- 
2.30.2