From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 126574 invoked by alias); 19 Oct 2016 01:13:01 -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 125846 invoked by uid 89); 19 Oct 2016 01:12:52 -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:gcc_tar, 1867,6, 18676 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:42 +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 48E8B81F01 for ; Wed, 19 Oct 2016 01:12:41 +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 u9J1CJjs019701 for ; Tue, 18 Oct 2016 21:12:40 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH v2 23/31] Use ui_file_as_string in gdbarch.sh/gdbarch.c Date: Wed, 19 Oct 2016 01:13:00 -0000 Message-Id: <1476839539-8374-24-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> X-SW-Source: 2016-10/txt/msg00534.txt.bz2 gdb/ChangeLog: yyyy-mm-yy Pedro Alves * gdbarch.sh (verify_gdbarch): Use ui_file_as_string and std::string. * gdbarch.c: Regenerate. --- gdb/gdbarch.c | 8 +++----- gdb/gdbarch.sh | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 4d8ef18..da4aa25 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -496,7 +496,6 @@ verify_gdbarch (struct gdbarch *gdbarch) struct ui_file *log; struct cleanup *cleanups; long length; - char *buf; log = mem_fileopen (); cleanups = make_cleanup_ui_file_delete (log); @@ -691,12 +690,11 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of gcc_target_options, invalid_p == 0 */ /* Skip verify of gnu_triplet_regexp, invalid_p == 0 */ /* Skip verify of addressable_memory_unit_size, invalid_p == 0 */ - buf = ui_file_xstrdup (log, &length); - make_cleanup (xfree, buf); - if (length > 0) + std::string buf = ui_file_as_string (log); + if (!buf.empty ()) internal_error (__FILE__, __LINE__, _("verify_gdbarch: the following are invalid ...%s"), - buf); + buf.c_str ()); do_cleanups (cleanups); } diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 1663156..036786e 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -1867,7 +1867,6 @@ verify_gdbarch (struct gdbarch *gdbarch) struct ui_file *log; struct cleanup *cleanups; long length; - char *buf; log = mem_fileopen (); cleanups = make_cleanup_ui_file_delete (log); @@ -1913,12 +1912,11 @@ do fi done cat < 0) + std::string buf = ui_file_as_string (log); + if (!buf.empty ()) internal_error (__FILE__, __LINE__, _("verify_gdbarch: the following are invalid ...%s"), - buf); + buf.c_str ()); do_cleanups (cleanups); } EOF -- 2.5.5