diff options
Diffstat (limited to 'gdb/cli/cli-interp.c')
| -rw-r--r-- | gdb/cli/cli-interp.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c index 35b7622..021b798 100644 --- a/gdb/cli/cli-interp.c +++ b/gdb/cli/cli-interp.c @@ -34,9 +34,8 @@ struct ui_out *cli_uiout; /* These are the ui_out and the interpreter for the console interpreter. */ /* Longjmp-safe wrapper for "execute_command" */ -static int do_captured_execute_command (struct ui_out *uiout, void *data); -static enum gdb_rc safe_execute_command (struct ui_out *uiout, char *command, - int from_tty); +static struct exception safe_execute_command (struct ui_out *uiout, + char *command, int from_tty); struct captured_execute_command_args { char *command; @@ -93,11 +92,11 @@ cli_interpreter_display_prompt_p (void *data) return 1; } -static int +static struct exception cli_interpreter_exec (void *data, const char *command_str) { - int result; struct ui_file *old_stream; + struct exception result; /* FIXME: cagney/2003-02-01: Need to const char *propogate safe_execute_command. */ @@ -115,23 +114,22 @@ cli_interpreter_exec (void *data, const char *command_str) return result; } -static int +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); - return GDB_RC_OK; } -static enum gdb_rc +static struct exception safe_execute_command (struct ui_out *uiout, char *command, int from_tty) { struct captured_execute_command_args args; args.command = command; args.from_tty = from_tty; - return catch_exceptions (uiout, do_captured_execute_command, &args, - NULL, RETURN_MASK_ALL); + return catch_exception (uiout, do_captured_execute_command, &args, + RETURN_MASK_ALL); } |