* 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.
This commit is contained in:
Tom Tromey
2011-04-04 18:13:05 +00:00
parent 58438ac187
commit 04bd08de86
7 changed files with 51 additions and 98 deletions

View File

@ -1589,19 +1589,6 @@ source_cleanup_lines (void *args)
source_file_name = p->old_file;
}
struct wrapped_read_command_file_args
{
FILE *stream;
};
static void
wrapped_read_command_file (struct ui_out *uiout, void *data)
{
struct wrapped_read_command_file_args *args = data;
read_command_file (args->stream);
}
/* Used to implement source_command. */
void
@ -1625,12 +1612,12 @@ script_from_file (FILE *stream, const char *file)
error_pre_print = "";
{
struct gdb_exception e;
struct wrapped_read_command_file_args args;
volatile struct gdb_exception e;
args.stream = stream;
e = catch_exception (uiout, wrapped_read_command_file, &args,
RETURN_MASK_ERROR);
TRY_CATCH (e, RETURN_MASK_ERROR)
{
read_command_file (stream);
}
switch (e.reason)
{
case 0: