From: Jeff Johnston Date: Mon, 22 Sep 2003 17:50:32 +0000 (+0000) Subject: 2003-09-22 Jeff Johnston X-Git-Tag: gdb_6_0-2003-10-04-release~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c2b2b8f5024a0783de24acfab91dfce173ef89d;p=thirdparty%2Fbinutils-gdb.git 2003-09-22 Jeff Johnston Merge from mainline: 2003-09-22 Jeff Johnston * top.c (quit_force): Fix indirect call to quit_target so a struct qt_args pointer is passed. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fc360bbf783..fb21e89a634 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2003-09-22 Jeff Johnston + + Merge from mainline: + 2003-09-22 Jeff Johnston + + * top.c (quit_force): Fix indirect call to quit_target so + a struct qt_args pointer is passed. + 2003-09-19 Daniel Jacobowitz Merge from mainline: diff --git a/gdb/top.c b/gdb/top.c index b174b33f362..5b94959e3e1 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -1732,6 +1732,7 @@ void quit_force (char *args, int from_tty) { int exit_code = 0; + struct qt_args qt; /* An optional expression may be used to cause gdb to terminate with the value of that expression. */ @@ -1742,8 +1743,11 @@ quit_force (char *args, int from_tty) exit_code = (int) value_as_long (val); } + qt.args = args; + qt.from_tty = from_tty; + /* We want to handle any quit errors and exit regardless. */ - catch_errors (quit_target, args, + catch_errors (quit_target, &qt, "Quitting: ", RETURN_MASK_ALL); exit (exit_code);