darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

From Fernando Nasser:

Browse source 
* remote.c (remote_async_open_1): Re-throw the exception when the
connection fails.
(remote_cisco_open): Ditto.
(remote_open_1): Ditto.
This commit is contained in:
Andrew Cagney 2002-05-19 20:11:17 +00:00
parent 36918e70e5
commit 165b8e33ee
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gdb/ChangeLog
View file

@ -1,3 +1,11 @@
2002-05-19 Andrew Cagney <ac131313@redhat.com>
From Fernando Nasser:
* remote.c (remote_async_open_1): Re-throw the exception when the
connection fails.
(remote_cisco_open): Ditto.
(remote_open_1): Ditto.
2002-05-19 Andrew Cagney <ac131313@redhat.com> 2002-05-19 Andrew Cagney <ac131313@redhat.com>
* remote.c (remote_start_remote_dummy): Add uiout parameter. * remote.c (remote_start_remote_dummy): Add uiout parameter.

18
gdb/remote.c
View file

@ -2314,7 +2314,11 @@ remote_open_1 (char *name, int from_tty, struct target_ops *target,
#endif #endif
/* Start the remote connection. If error() or QUIT, discard this /* Start the remote connection. If error() or QUIT, discard this
target (we'd otherwise be in an inconsistent state). target (we'd otherwise be in an inconsistent state) and then
propogate the error on up the exception chain. This ensures that
the caller doesn't stumble along blindly assuming that the
function succeeded. The CLI doesn't have this problem but other
UI's, such as MI do.
FIXME: cagney/2002-05-19: Instead of re-throwing the exception, FIXME: cagney/2002-05-19: Instead of re-throwing the exception,
this function should return an error indication letting the this function should return an error indication letting the
@ -2332,7 +2336,7 @@ remote_open_1 (char *name, int from_tty, struct target_ops *target,
if (ex < 0) if (ex < 0)
{ {
pop_target (); pop_target ();
return; throw_exception (ex);
} }
if (extended_p) if (extended_p)
@ -2437,7 +2441,8 @@ remote_async_open_1 (char *name, int from_tty, struct target_ops *target,
#endif #endif
/* Start the remote connection; if error, discard this target. See /* Start the remote connection; if error, discard this target. See
the comments in remote_open_1() for further details. */ the comments in remote_open_1() for further details such as the
need to re-throw the exception. */
ex = catch_exceptions (uiout, ex = catch_exceptions (uiout,
remote_start_remote, NULL, remote_start_remote, NULL,
"Couldn't establish connection to remote" "Couldn't establish connection to remote"
@ -2447,7 +2452,7 @@ remote_async_open_1 (char *name, int from_tty, struct target_ops *target,
{ {
pop_target (); pop_target ();
wait_forever_enabled_p = 1; wait_forever_enabled_p = 1;
return; throw_exception (ex);
} }
wait_forever_enabled_p = 1; wait_forever_enabled_p = 1;
@ -5555,7 +5560,8 @@ remote_cisco_open (char *name, int from_tty)
inferior_ptid = pid_to_ptid (MAGIC_NULL_PID); inferior_ptid = pid_to_ptid (MAGIC_NULL_PID);
/* Start the remote connection; if error, discard this target. See /* Start the remote connection; if error, discard this target. See
the comments in remote_open_1() for further details. */ the comments in remote_open_1() for further details such as the
need to re-throw the exception. */
ex = catch_exceptions (uiout, ex = catch_exceptions (uiout,
remote_start_remote_dummy, NULL, remote_start_remote_dummy, NULL,
"Couldn't establish connection to remote" "Couldn't establish connection to remote"
@ -5564,7 +5570,7 @@ remote_cisco_open (char *name, int from_tty)
if (ex < 0) if (ex < 0)
{ {
pop_target (); pop_target ();
return; throw_exception (ex);
} }
} }