From 04bd08de86a7768754137e2c03fa92c3af0140b0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 4 Apr 2011 18:13:05 +0000 Subject: * cli/cli-interp.c (struct captured_execute_command_args): Remove. (do_captured_execute_command): Remove. (safe_execute_command): Use TRY_CATCH. * cli/cli-script.c (struct wrapped_read_command_file_args): Remove. (wrapped_read_command_file): Remove. (script_from_file): Use TRY_CATCH. * exceptions.c (catch_exception): Remove. * exceptions.h (catch_exception): Remove. (deprecated_throw_reason): Update comment. * mi/mi-main.c (captured_mi_execute_command): Change 'data' argument to 'context'. (mi_execute_command): Use TRY_CATCH. * remote.c (struct start_remote_args): Remove. (remote_start_remote): Update; change arguments. (remote_open_1): Use TRY_CATCH. --- gdb/cli/cli-interp.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'gdb/cli/cli-interp.c') diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c index 7a517e9..88a570c 100644 --- a/gdb/cli/cli-interp.c +++ b/gdb/cli/cli-interp.c @@ -37,12 +37,6 @@ struct ui_out *cli_uiout; static struct gdb_exception safe_execute_command (struct ui_out *uiout, char *command, int from_tty); -struct captured_execute_command_args -{ - char *command; - int from_tty; -}; - /* These implement the cli out interpreter: */ static void * @@ -117,25 +111,15 @@ cli_interpreter_exec (void *data, const char *command_str) return result; } -static void -do_captured_execute_command (struct ui_out *uiout, void *data) -{ - struct captured_execute_command_args *args = - (struct captured_execute_command_args *) data; - - execute_command (args->command, args->from_tty); -} - static struct gdb_exception safe_execute_command (struct ui_out *uiout, char *command, int from_tty) { - struct gdb_exception e; - struct captured_execute_command_args args; + volatile struct gdb_exception e; - args.command = command; - args.from_tty = from_tty; - e = catch_exception (uiout, do_captured_execute_command, &args, - RETURN_MASK_ALL); + TRY_CATCH (e, RETURN_MASK_ALL) + { + execute_command (command, from_tty); + } /* FIXME: cagney/2005-01-13: This shouldn't be needed. Instead the caller should print the exception. */ exception_print (gdb_stderr, e); -- cgit v1.1