* defs.h (deprecated_error_hook): Delete declaration.

	* interps.c (clear_interpreter_hooks): Adjust.
	* remote-sim.c (gdb_os_error): Don't try to call
	deprecated_error_hook.  No need to call exit anymore.
	* top.c (deprecated_error_hook): Delete.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 949a9fd026cbd44db4508870f981973e65c99575..e2eeb67823e4c71903dd4cdf4f1d9bcfa0eeb447 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-09  Pedro Alves  <pedro@codesourcery.com>
+
+       * defs.h (deprecated_error_hook): Delete declaration.
+       * interps.c (clear_interpreter_hooks): Adjust.
+       * remote-sim.c (gdb_os_error): Don't try to call
+       deprecated_error_hook.  No need to call exit anymore.
+       * top.c (deprecated_error_hook): Delete.
+
 2009-01-09  Joel Brobecker  <brobecker@adacore.com>
 
        * arch-utils.c (gdbarch_update_p): Use host_address_to_string

diff --git a/gdb/defs.h b/gdb/defs.h
index 4465676b0d4b3468d3c781e65966af207852631b..209b11d38dd4f28b4de0978219e187cb52b02fb4 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -1109,8 +1109,6 @@ extern void (*deprecated_call_command_hook) (struct cmd_list_element * c,
 
 extern void (*deprecated_set_hook) (struct cmd_list_element * c);
 
-extern void (*deprecated_error_hook) (void);
-
 extern void (*deprecated_error_begin_hook) (void);
 
 extern int (*deprecated_ui_load_progress_hook) (const char *section,

diff --git a/gdb/interps.c b/gdb/interps.c
index e0fea6df097b37154104f8745a0d4ac0e06e8655..6814a72c375d2d6b52155765cabf1ba021390900 100644 (file)
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -346,7 +346,6 @@ clear_interpreter_hooks (void)
   deprecated_context_hook = 0;
   deprecated_target_wait_hook = 0;
   deprecated_call_command_hook = 0;
-  deprecated_error_hook = 0;
   deprecated_error_begin_hook = 0;
   deprecated_command_loop_hook = 0;
 }

diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 6bd05089907e50891eb1f835b3d157688f4ff710..5b9d2d3155888d880b0f1a527cb75d75a22cb70b 100644 (file)
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -262,18 +262,12 @@ gdb_os_evprintf_filtered (host_callback * p, const char *format, va_list ap)
 /* GDB version of error callback.  */
 
 static void
-gdb_os_error (host_callback * p, const char *format,...)
+gdb_os_error (host_callback * p, const char *format, ...)
 {
-  if (deprecated_error_hook)
-    (*deprecated_error_hook) ();
-  else
-    {
-      va_list args;
-      va_start (args, format);
-      verror (format, args);
-      va_end (args);
-    }
-  exit (1);
+  va_list args;
+  va_start (args, format);
+  verror (format, args);
+  va_end (args);
 }
 
 int

diff --git a/gdb/top.c b/gdb/top.c
index a962aad10d959cde800deef8ca1b724da6efddb4..d5ef7067ab89ff77d390af959ee41a2e35211f04 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -283,11 +283,6 @@ void (*deprecated_set_hook) (struct cmd_list_element * c);
 
 void (*deprecated_context_hook) (int id);
 
-/* Takes control from error ().  Typically used to prevent longjmps out of the
-   middle of the GUI.  Usually used in conjunction with a catch routine.  */
-
-void (*deprecated_error_hook) (void);
-
 /* Handler for SIGHUP.  */
 
 #ifdef SIGHUP