2003-09-22 Jeff Johnston <jjohnstn@redhat.com>

        Merge from mainline:
        2003-09-22  Jeff Johnston  <jjohnstn@redhat.com>

        * 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 fc360bbf7839d43f9add05ebbaa69d1a0464cbe8..fb21e89a634fc9099868785c64961335d9492280 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+       Merge from mainline:
+       2003-09-22  Jeff Johnston  <jjohnstn@redhat.com>
+
+        * top.c (quit_force): Fix indirect call to quit_target so
+        a struct qt_args pointer is passed.
+
 2003-09-19  Daniel Jacobowitz  <drow@mvista.com>
 
        Merge from mainline:

diff --git a/gdb/top.c b/gdb/top.c
index b174b33f36219d01191811494f47d45616149f7b..5b94959e3e1de5925b73254e12a76e7ec191940c 100644 (file)
--- 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);