From 257e6d53e260db58681013eb25ea17ee061ba052 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Thu, 5 Sep 2013 16:46:56 +0000 Subject: [PATCH] Remove deprecated_command_loop_hook. https://sourceware.org/ml/gdb-patches/2013-09/msg00174.html gdb/ChangeLog * gdb/defs.h (deprecated_command_loop_hook): Remove, including references in comments. * gdb/interps.c (current_interp_command_loop): No longer use deprecated_command_loop_hook. (clear_interpreter_hooks): Remove deprecated_command_loop_hook setup. * gdb/top.c (deprecated_command_loop_hook): Remove. --- gdb/ChangeLog | 10 ++++++++++ gdb/defs.h | 7 ++----- gdb/interps.c | 10 +++------- gdb/top.c | 5 ----- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 92452a90ac2..18ee8c8d8b6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2013-09-05 Andrew Burgess + + * gdb/defs.h (deprecated_command_loop_hook): Remove, including + references in comments. + * gdb/interps.c (current_interp_command_loop): No longer use + deprecated_command_loop_hook. + (clear_interpreter_hooks): Remove deprecated_command_loop_hook + setup. + * gdb/top.c (deprecated_command_loop_hook): Remove. + 2013-09-05 Pedro Alves * dwarf2loc.c (dwarf2_evaluate_loc_desc_full): 'dwarf_regnum' diff --git a/gdb/defs.h b/gdb/defs.h index 1e5521fc371..50b9bfe09c3 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -703,10 +703,8 @@ extern int watchdog; extern char *interpreter_p; /* If a given interpreter matches INTERPRETER_P then it should update - deprecated_command_loop_hook and deprecated_init_ui_hook with the - per-interpreter implementation. */ -/* FIXME: deprecated_command_loop_hook and deprecated_init_ui_hook - should be moved here. */ + deprecated_init_ui_hook with the per-interpreter implementation. */ +/* FIXME: deprecated_init_ui_hook should be moved here. */ struct target_waitstatus; struct cmd_list_element; @@ -716,7 +714,6 @@ extern void (*deprecated_post_add_symbol_hook) (void); extern void (*selected_frame_level_changed_hook) (int); extern int (*deprecated_ui_loop_hook) (int signo); extern void (*deprecated_init_ui_hook) (char *argv0); -extern void (*deprecated_command_loop_hook) (void); extern void (*deprecated_show_load_progress) (const char *section, unsigned long section_sent, unsigned long section_size, diff --git a/gdb/interps.c b/gdb/interps.c index 25500d6e835..33e0f721ac4 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -320,12 +320,9 @@ void current_interp_command_loop (void) { /* Somewhat messy. For the moment prop up all the old ways of - selecting the command loop. `deprecated_command_loop_hook' - should be deprecated. */ - if (deprecated_command_loop_hook != NULL) - deprecated_command_loop_hook (); - else if (current_interpreter != NULL - && current_interpreter->procs->command_loop_proc != NULL) + selecting the command loop. */ + if (current_interpreter != NULL + && current_interpreter->procs->command_loop_proc != NULL) current_interpreter->procs->command_loop_proc (current_interpreter->data); else cli_command_loop (); @@ -386,7 +383,6 @@ clear_interpreter_hooks (void) deprecated_target_wait_hook = 0; deprecated_call_command_hook = 0; deprecated_error_begin_hook = 0; - deprecated_command_loop_hook = 0; } /* This is a lazy init routine, called the first time the interpreter diff --git a/gdb/top.c b/gdb/top.c index bb712636579..b3e7d375360 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -199,11 +199,6 @@ void (*deprecated_init_ui_hook) (char *argv0); int (*deprecated_ui_loop_hook) (int); -/* Called instead of command_loop at top level. Can be invoked via - throw_exception(). */ - -void (*deprecated_command_loop_hook) (void); - /* Called from print_frame_info to list the line we stopped in. */ -- 2.30.2