From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19222 invoked by alias); 9 May 2013 18:51:27 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 19181 invoked by uid 89); 9 May 2013 18:51:26 -0000 X-Spam-SWARE-Status: No, score=-7.7 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.1 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 09 May 2013 18:51:26 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r49IpP7B011892 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 9 May 2013 14:51:25 -0400 Received: from barimba (ovpn-113-133.phx2.redhat.com [10.3.113.133]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r49IpNmx015306 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Thu, 9 May 2013 14:51:24 -0400 From: Tom Tromey From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 15/40] make a cleanup unconditionally in tracepoint.c In-Reply-To: References: Message-Id: <568e3554958cb42488bc51f5e2bd8b5cd817803c.1368124285.git.tromey@redhat.com> Date: Thu, 09 May 2013 18:51:00 -0000 MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2013-05/txt/msg00329.txt.bz2 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