[PATCH 15/40] make a cleanup unconditionally in tracepoint.c

Tom Tromey
2013-05-09T18:51:27Z

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.
---
gdb/tracepoint.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index e2b21af..a774b19 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -2929,7 +2929,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)
{
@@ -2937,6 +2937,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)
@@ -2970,7 +2971,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);
@@ -2981,8 +2982,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
--
1.8.1.4