From patchwork Wed Oct 19 01:11:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 16634 Received: (qmail 123674 invoked by alias); 19 Oct 2016 01:12:32 -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 123532 invoked by uid 89); 19 Oct 2016 01:12:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 19 Oct 2016 01:12:29 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5FDDA7AE9D for ; Wed, 19 Oct 2016 01:12:28 +0000 (UTC) Received: from cascais.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9J1CJjd019701 for ; Tue, 18 Oct 2016 21:12:27 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH v2 08/31] Use ui_file_as_string in dwarf2_compute_name Date: Wed, 19 Oct 2016 02:11:56 +0100 Message-Id: <1476839539-8374-9-git-send-email-palves@redhat.com> In-Reply-To: <1476839539-8374-1-git-send-email-palves@redhat.com> References: <1476839539-8374-1-git-send-email-palves@redhat.com> gdb/ChangeLog: yyyy-mm-yy Pedro Alves * dwarf2read.c (dwarf2_compute_name): Use ui_file_as_string and std::string. --- gdb/dwarf2read.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index c070cd7..6cc79ea 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -8487,7 +8487,6 @@ dwarf2_compute_name (const char *name, long length; const char *prefix; struct ui_file *buf; - char *intermediate_name; const char *canonical_name = NULL; prefix = determine_prefix (die, cu); @@ -8656,26 +8655,24 @@ dwarf2_compute_name (const char *name, } } - intermediate_name = ui_file_xstrdup (buf, &length); + std::string intermediate_name = ui_file_as_string (buf); ui_file_delete (buf); if (cu->language == language_cplus) canonical_name - = dwarf2_canonicalize_name (intermediate_name, cu, + = dwarf2_canonicalize_name (intermediate_name.c_str (), cu, &objfile->per_bfd->storage_obstack); /* If we only computed INTERMEDIATE_NAME, or if INTERMEDIATE_NAME is already canonical, then we need to copy it to the appropriate obstack. */ - if (canonical_name == NULL || canonical_name == intermediate_name) + if (canonical_name == NULL || canonical_name == intermediate_name.c_str ()) name = ((const char *) obstack_copy0 (&objfile->per_bfd->storage_obstack, - intermediate_name, - strlen (intermediate_name))); + intermediate_name.c_str (), + intermediate_name.length ())); else name = canonical_name; - - xfree (intermediate_name); } }