From 58d4abe16b37770aa4d5e0c6548b4ff039509d54 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 9 Jan 2009 17:29:52 +0000 Subject: [PATCH] * 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. --- gdb/ChangeLog | 8 ++++++++ gdb/defs.h | 2 -- gdb/interps.c | 1 - gdb/remote-sim.c | 16 +++++----------- gdb/top.c | 5 ----- 5 files changed, 13 insertions(+), 19 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 949a9fd..e2eeb67 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2009-01-09 Pedro Alves + + * 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 * arch-utils.c (gdbarch_update_p): Use host_address_to_string diff --git a/gdb/defs.h b/gdb/defs.h index 4465676..209b11d 100644 --- 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 e0fea6d..6814a72 100644 --- 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 6bd0508..5b9d2d3 100644 --- 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 a962aad..d5ef706 100644 --- 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 -- 2.7.4