commit e29e63040dd09449a21762bcacabdf31d580beee
author Tom Tromey <tom@tromey.com> Sun Apr 16 12:40:33 2023 -0600
committer Tom Tromey <tom@tromey.com> Tue May 02 09:14:11 2023 -0600
tree b70a9d3c5d5970c9cb8454f3e28ac41b32d85883
parent b545d4239bedf9001926efd55da2aa2bd2bbb94a

Remove error_stream

error_stream is trivial and only used in a couple of spots in
breakpoint.c.  This patch removes it in favor of just writing it out
at the spots where it was used.

gdb/breakpoint.c

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 5477500..30d438d 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -3138,7 +3138,7 @@ update_inserted_breakpoint_locations (void)
   if (error_flag)
     {
       target_terminal::ours_for_output ();
-      error_stream (tmp_error_stream);
+      error (("%s"), tmp_error_stream.c_str ());
     }
 }
 
@@ -3235,7 +3235,7 @@ insert_breakpoint_locations (void)
 You may have requested too many hardware breakpoints/watchpoints.\n");
 	}
       target_terminal::ours_for_output ();
-      error_stream (tmp_error_stream);
+      error (("%s"), tmp_error_stream.c_str ());
     }
 }
 

gdb/utils.c

diff --git a/gdb/utils.c b/gdb/utils.c
index 3cd2287..3af54ec 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -166,12 +166,6 @@ verror (const char *string, va_list args)
   throw_verror (GENERIC_ERROR, string, args);
 }
 
-void
-error_stream (const string_file &stream)
-{
-  error (("%s"), stream.c_str ());
-}
-
 /* Emit a message and abort.  */
 
 static void ATTRIBUTE_NORETURN

gdb/utils.h

diff --git a/gdb/utils.h b/gdb/utils.h
index 29ff376..2d831ba 100644
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -285,8 +285,6 @@ extern void (*deprecated_error_begin_hook) (void);
 
 extern const char *warning_pre_print;
 
-extern void error_stream (const string_file &) ATTRIBUTE_NORETURN;
-
 extern void demangler_vwarning (const char *file, int line,
 			       const char *, va_list ap)
      ATTRIBUTE_PRINTF (3, 0);