From patchwork Thu Sep 28 19:50:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 23207 Received: (qmail 10675 invoked by alias); 28 Sep 2017 19:50:22 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 10495 invoked by uid 89); 28 Sep 2017 19:50:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=cust X-HELO: gproxy5-pub.mail.unifiedlayer.com Received: from gproxy5-pub.mail.unifiedlayer.com (HELO gproxy5-pub.mail.unifiedlayer.com) (67.222.38.55) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 28 Sep 2017 19:50:20 +0000 Received: from cmgw4 (unknown [10.0.90.85]) by gproxy5.mail.unifiedlayer.com (Postfix) with ESMTP id 5A6A5140744 for ; Thu, 28 Sep 2017 13:50:19 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id F7qG1w00J2f2jeq017qKwv; Thu, 28 Sep 2017 13:50:19 -0600 X-Authority-Analysis: v=2.2 cv=OZLoNlbY c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=2JCJgTwv5E4A:10 a=zstS-IiYAAAA:8 a=RuMDdIlELuh2Ckn7B7cA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 75-166-0-208.hlrn.qwest.net ([75.166.0.208]:56208 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1dxep6-003LpU-5l; Thu, 28 Sep 2017 13:50:16 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 11/12] Remove a cleanup from symtab.c Date: Thu, 28 Sep 2017 13:50:10 -0600 Message-Id: <20170928195011.27382-12-tom@tromey.com> In-Reply-To: <20170928195011.27382-1-tom@tromey.com> References: <20170928195011.27382-1-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1dxep6-003LpU-5l X-Source-Sender: 75-166-0-208.hlrn.qwest.net (bapiya.Home) [75.166.0.208]:56208 X-Source-Auth: tom+tromey.com X-Email-Count: 12 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes This removes an unused outer cleanup from symtab.c, and an unused cleanup declaration as well. gdb/ChangeLog 2017-09-28 Tom Tromey * symtab.c (search_symbols): Remove unused outer cleanup. (make_source_files_completion_list): Remove unused declaration. --- gdb/ChangeLog | 5 +++++ gdb/symtab.c | 9 +-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gdb/symtab.c b/gdb/symtab.c index 2da37e8..47385df 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -4241,11 +4241,6 @@ search_symbols (const char *regexp, enum search_domain kind, int nfound; gdb::optional preg; - /* OLD_CHAIN .. RETVAL_CHAIN is always freed, RETVAL_CHAIN .. current - CLEANUP_CHAIN is freed only in the case of an error. */ - struct cleanup *old_chain = make_cleanup (null_cleanup, NULL); - struct cleanup *retval_chain; - gdb_assert (kind <= TYPES_DOMAIN); ourtype = types[kind]; @@ -4365,7 +4360,7 @@ search_symbols (const char *regexp, enum search_domain kind, found = NULL; tail = NULL; nfound = 0; - retval_chain = make_cleanup_free_search_symbols (&found); + struct cleanup *retval_chain = make_cleanup_free_search_symbols (&found); ALL_COMPUNITS (objfile, cust) { @@ -4478,7 +4473,6 @@ search_symbols (const char *regexp, enum search_domain kind, } discard_cleanups (retval_chain); - do_cleanups (old_chain); *matches = found; } @@ -5439,7 +5433,6 @@ make_source_files_completion_list (const char *text, const char *word) completion_list list; const char *base_name; struct add_partial_filename_data datum; - struct cleanup *back_to; if (!have_full_symbols () && !have_partial_symbols ()) return list;