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.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 547750009191e3335081cfb4f5953f6339637486..30d438d06df92dfa9c9fb4ec55de8e0d32deddd4 100644 (file)
--- 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 ());
     }
 }
 

diff --git a/gdb/utils.c b/gdb/utils.c
index 3cd2287a52ea4f101d068b3a29a4c182adca66ef..3af54ec51799287302142e5646965502b2711860 100644 (file)
--- 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

diff --git a/gdb/utils.h b/gdb/utils.h
index 29ff376bb52e894a54c142007d7250e2f3aa9505..2d831bac1848eb1e13212de4ee80addce08ad15d 100644 (file)
--- 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);