make a cleanup unconditionally in tracepoint.c

This is another cosmetic patch.  It introduces an "outer" cleanup in
trace_dump_command and arranges to unconditionally call do_cleanups.
This lets the checker analyze the function.

	* tracepoint.c (trace_dump_command): Unconditionally call
	do_cleanups.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 94db23f62f4aabd5c219060aaa590c8e411d728b..e3445721f10e362ba28f89090b3b93e88659d465 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-30  Tom Tromey  <tromey@redhat.com>
+
+       * tracepoint.c (trace_dump_command): Unconditionally call
+       do_cleanups.
+
 2013-05-30  Tom Tromey  <tromey@redhat.com>
 
        * breakpoint.c (output_thread_groups, parse_cmd_to_aexpr): Call

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 26aedac4825009cf7cc3412d478d87755c0093e1..614f6b755518751a522f9e4570b61e9e53a44565 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -2923,7 +2923,7 @@ trace_dump_command (char *args, int from_tty)
   struct bp_location *loc;
   char *default_collect_line = NULL;
   struct command_line *actions, *default_collect_action = NULL;
-  struct cleanup *old_chain = NULL;
+  struct cleanup *old_chain;
 
   if (tracepoint_number == -1)
     {
@@ -2931,6 +2931,7 @@ trace_dump_command (char *args, int from_tty)
       return;
     }
 
+  old_chain = make_cleanup (null_cleanup, NULL);
   t = get_tracepoint (tracepoint_number);
 
   if (t == NULL)
@@ -2964,7 +2965,7 @@ trace_dump_command (char *args, int from_tty)
   if (*default_collect)
     {
       default_collect_line = xstrprintf ("collect %s", default_collect);
-      old_chain = make_cleanup (xfree, default_collect_line);
+      make_cleanup (xfree, default_collect_line);
       validate_actionline (default_collect_line, &t->base);
       default_collect_action = xmalloc (sizeof (struct command_line));
       make_cleanup (xfree, default_collect_action);
@@ -2975,8 +2976,7 @@ trace_dump_command (char *args, int from_tty)
 
   trace_dump_actions (actions, 0, stepping_frame, from_tty);
 
-  if (*default_collect)
-    do_cleanups (old_chain);
+  do_cleanups (old_chain);
 }
 
 /* Encode a piece of a tracepoint's source-level definition in a form