From patchwork Wed Oct 19 01:12:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 16641 Received: (qmail 124909 invoked by alias); 19 Oct 2016 01:12:43 -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 124855 invoked by uid 89); 19 Oct 2016 01:12:42 -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=sk:convers 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:41 +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 52733C05678E for ; Wed, 19 Oct 2016 01:12:40 +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 u9J1CJjr019701 for ; Tue, 18 Oct 2016 21:12:39 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH v2 22/31] Use ui_file_as_string in gdb/c-exp.y Date: Wed, 19 Oct 2016 02:12:10 +0100 Message-Id: <1476839539-8374-23-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 * c-exp.y (OPERATOR NEW): Adjust to use ui_file_as_string and std::string. --- gdb/c-exp.y | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gdb/c-exp.y b/gdb/c-exp.y index 29f672f..f65e3a1 100644 --- a/gdb/c-exp.y +++ b/gdb/c-exp.y @@ -1555,16 +1555,13 @@ oper: OPERATOR NEW | OPERATOR OBJC_LBRAC ']' { $$ = operator_stoken ("[]"); } | OPERATOR conversion_type_id - { char *name; - long length; - struct ui_file *buf = mem_fileopen (); + { struct ui_file *buf = mem_fileopen (); c_print_type ($2, NULL, buf, -1, 0, &type_print_raw_options); - name = ui_file_xstrdup (buf, &length); + std::string name = ui_file_as_string (buf); ui_file_delete (buf); - $$ = operator_stoken (name); - free (name); + $$ = operator_stoken (name.c_str ()); } ;