From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 94985 invoked by alias); 18 Aug 2017 20:01:06 -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 88983 invoked by uid 89); 18 Aug 2017 20:00:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_STOCKGEN,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gproxy8-pub.mail.unifiedlayer.com Received: from gproxy8-pub.mail.unifiedlayer.com (HELO gproxy8-pub.mail.unifiedlayer.com) (67.222.33.93) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 18 Aug 2017 20:00:32 +0000 Received: from cmgw2 (unknown [10.0.90.83]) by gproxy8.mail.unifiedlayer.com (Postfix) with ESMTP id 967281AB0AE for ; Fri, 18 Aug 2017 14:00:30 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw2 with id yk0T1v00o2f2jeq01k0WDF; Fri, 18 Aug 2017 14:00:30 -0600 X-Authority-Analysis: v=2.2 cv=T7z8d7CQ c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=KeKAF7QvOSUA:10 a=zstS-IiYAAAA:8 a=Z_H-1w-gXZNDu7fcfawA:9 a=AAnQLBTt8nOtcYJy:21 a=KLSmIbynNJB2mUCn:21 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 75-166-24-97.hlrn.qwest.net ([75.166.24.97]:49122 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1dinRT-001KNP-37; Fri, 18 Aug 2017 14:00:27 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 5/5] Change psymtab_search_name to return a unique_xmalloc_ptr Date: Fri, 18 Aug 2017 20:01:00 -0000 Message-Id: <20170818200024.4948-6-tom@tromey.com> In-Reply-To: <20170818200024.4948-1-tom@tromey.com> References: <20170818200024.4948-1-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1dinRT-001KNP-37 X-Source-Sender: 75-166-24-97.hlrn.qwest.net (bapiya.Home) [75.166.24.97]:49122 X-Source-Auth: tom+tromey.com X-Email-Count: 6 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes X-SW-Source: 2017-08/txt/msg00363.txt.bz2 This changes psymtab_search_name to return a unique_xmalloc_ptr and fixes up its one caller. This allows the removal of some cleanups. ChangeLog 2017-08-18 Tom Tromey * psymtab.c (psymtab_search_name): Return a unique_xmalloc_ptr. (lookup_partial_symbol): Update. --- gdb/ChangeLog | 5 +++++ gdb/psymtab.c | 32 ++++++++++++-------------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a15df78..4e03f29 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2017-08-18 Tom Tromey + * psymtab.c (psymtab_search_name): Return a unique_xmalloc_ptr. + (lookup_partial_symbol): Update. + +2017-08-18 Tom Tromey + * source.h (rewrite_source_path): Return a unique_xmalloc_ptr. * source.c (rewrite_source_path): Return a unique_xmalloc_ptr. (find_and_open_source, symtab_to_fullname): Update. diff --git a/gdb/psymtab.c b/gdb/psymtab.c index 6307d6e..4cbf91c 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -627,7 +627,7 @@ match_partial_symbol (struct objfile *objfile, The caller is responsible for freeing the return result. */ -static char * +static gdb::unique_xmalloc_ptr psymtab_search_name (const char *name) { switch (current_language->la_language) @@ -639,7 +639,7 @@ psymtab_search_name (const char *name) char *ret = cp_remove_params (name); if (ret) - return ret; + return gdb::unique_xmalloc_ptr (ret); } } break; @@ -648,7 +648,7 @@ psymtab_search_name (const char *name) break; } - return xstrdup (name); + return gdb::unique_xmalloc_ptr (xstrdup (name)); } /* Look, in partial_symtab PST, for symbol whose natural name is NAME. @@ -663,14 +663,11 @@ lookup_partial_symbol (struct objfile *objfile, struct partial_symbol **top, **real_top, **bottom, **center; int length = (global ? pst->n_global_syms : pst->n_static_syms); int do_linear_search = 1; - char *search_name; - struct cleanup *cleanup; if (length == 0) return NULL; - search_name = psymtab_search_name (name); - cleanup = make_cleanup (xfree, search_name); + gdb::unique_xmalloc_ptr search_name = psymtab_search_name (name); start = (global ? objfile->global_psymbols.list + pst->globals_offset : objfile->static_psymbols.list + pst->statics_offset); @@ -695,7 +692,7 @@ lookup_partial_symbol (struct objfile *objfile, internal_error (__FILE__, __LINE__, _("failed internal consistency check")); if (strcmp_iw_ordered (SYMBOL_SEARCH_NAME (*center), - search_name) >= 0) + search_name.get ()) >= 0) { top = center; } @@ -710,20 +707,19 @@ lookup_partial_symbol (struct objfile *objfile, /* For `case_sensitivity == case_sensitive_off' strcmp_iw_ordered will search more exactly than what matches SYMBOL_MATCHES_SEARCH_NAME. */ - while (top >= start && SYMBOL_MATCHES_SEARCH_NAME (*top, search_name)) + while (top >= start && SYMBOL_MATCHES_SEARCH_NAME (*top, + search_name.get ())) top--; /* Fixup to have a symbol which matches SYMBOL_MATCHES_SEARCH_NAME. */ top++; - while (top <= real_top && SYMBOL_MATCHES_SEARCH_NAME (*top, search_name)) + while (top <= real_top + && SYMBOL_MATCHES_SEARCH_NAME (*top, search_name.get ())) { if (symbol_matches_domain (SYMBOL_LANGUAGE (*top), SYMBOL_DOMAIN (*top), domain)) - { - do_cleanups (cleanup); - return *top; - } + return *top; top++; } } @@ -737,15 +733,11 @@ lookup_partial_symbol (struct objfile *objfile, { if (symbol_matches_domain (SYMBOL_LANGUAGE (*psym), SYMBOL_DOMAIN (*psym), domain) - && SYMBOL_MATCHES_SEARCH_NAME (*psym, search_name)) - { - do_cleanups (cleanup); - return *psym; - } + && SYMBOL_MATCHES_SEARCH_NAME (*psym, search_name.get ())) + return *psym; } } - do_cleanups (cleanup); return NULL; } -- 2.9.4