From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 124698 invoked by alias); 19 Oct 2016 01:12:41 -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 124625 invoked by uid 89); 19 Oct 2016 01:12:40 -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=Hx-languages-length:1045 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:39 +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 6CDEC61E53 for ; Wed, 19 Oct 2016 01:12:38 +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 u9J1CJjp019701 for ; Tue, 18 Oct 2016 21:12:37 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH v2 20/31] Use ui_file_as_string in gdb/cli/cli-setshow.c Date: Wed, 19 Oct 2016 01:12:00 -0000 Message-Id: <1476839539-8374-21-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/msg00532.txt.bz2 gdb/ChangeLog: yyyy-mm-yy Pedro Alves * cli/cli-setshow.c (do_show_command): Adjust to use ui_file_as_string and std::string. --- gdb/cli/cli-setshow.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c index eb17158..d2ec1df 100644 --- a/gdb/cli/cli-setshow.c +++ b/gdb/cli/cli-setshow.c @@ -653,13 +653,12 @@ do_show_command (const char *arg, int from_tty, struct cmd_list_element *c) ui_out_field_stream (uiout, "value", stb); else { - char *value = ui_file_xstrdup (stb, NULL); + std::string value = ui_file_as_string (stb); - make_cleanup (xfree, value); if (c->show_value_func != NULL) - c->show_value_func (gdb_stdout, from_tty, c, value); + c->show_value_func (gdb_stdout, from_tty, c, value.c_str ()); else - deprecated_show_value_hack (gdb_stdout, from_tty, c, value); + deprecated_show_value_hack (gdb_stdout, from_tty, c, value.c_str ()); } do_cleanups (old_chain); -- 2.5.5