Remove stale code.

        * infrun.c (finish_command): Don't pass cleanup
        to continuation.
        (finish_command_continuation): Don't grab cleanup from
        the passed data, as we don't use, and cannot, use it anyway.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a00c5fa30eaa0846f08e26554db6ef0076a43006..1d80cc6d9b46c2b93ef364be0a032f5d0cd0755a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-10  Vladimir Prus  <vladimir@codesourcery.com>
+
+       Remove stale code.
+        * infrun.c (finish_command): Don't pass cleanup
+        to continuation.
+        (finish_command_continuation): Don't grab cleanup from
+        the passed data, as we don't use, and cannot, use it anyway.
+
 2008-06-10  Vladimir Prus  <vladimir@codesourcery.com>
 
        Introduce common cleanup for restoring integers.

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 2397c30a09e12492b678d528039273652ad6f004..30858f1a7a7d7bed604ddee5c8cd7ddfc731d18a 100644 (file)
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1278,7 +1278,6 @@ finish_command_continuation (struct continuation_arg *arg, int error_p)
 
   breakpoint = (struct breakpoint *) arg->data.pointer;
   function = (struct symbol *) arg->next->data.pointer;
-  cleanups = (struct cleanup *) arg->next->next->data.pointer;
 
   if (!error_p)
     {
@@ -1369,14 +1368,10 @@ finish_command (char *arg, int from_tty)
     (struct continuation_arg *) xmalloc (sizeof (struct continuation_arg));
   arg2 =
     (struct continuation_arg *) xmalloc (sizeof (struct continuation_arg));
-  arg3 =
-    (struct continuation_arg *) xmalloc (sizeof (struct continuation_arg));
   arg1->next = arg2;
-  arg2->next = arg3;
-  arg3->next = NULL;
+  arg2->next = NULL;
   arg1->data.pointer = breakpoint;
   arg2->data.pointer = function;
-  arg3->data.pointer = old_chain;
   add_continuation (finish_command_continuation, arg1);
 
   /* Do this only if not running asynchronously or if the target