From patchwork Sun May 27 15:20:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 27518 Received: (qmail 59519 invoked by alias); 27 May 2018 15:20:17 -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 59472 invoked by uid 89); 27 May 2018 15:20:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=MESSAGE, Hx-languages-length:1280 X-HELO: gateway23.websitewelcome.com Received: from gateway23.websitewelcome.com (HELO gateway23.websitewelcome.com) (192.185.49.184) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 27 May 2018 15:20:14 +0000 Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway23.websitewelcome.com (Postfix) with ESMTP id D4F98CDF for ; Sun, 27 May 2018 10:20:12 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id MxSufudHPPvAdMxSuf9HPO; Sun, 27 May 2018 10:20:12 -0500 X-Authority-Reason: nr=8 Received: from 174-29-44-154.hlrn.qwest.net ([174.29.44.154]:51012 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fMxSu-004Ahx-L3; Sun, 27 May 2018 10:20:12 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 1/4] Use std::string in ppscm_make_pp_type_error_exception Date: Sun, 27 May 2018 09:20:06 -0600 Message-Id: <20180527152009.4228-2-tom@tromey.com> In-Reply-To: <20180527152009.4228-1-tom@tromey.com> References: <20180527152009.4228-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1fMxSu-004Ahx-L3 X-Source-Sender: 174-29-44-154.hlrn.qwest.net (bapiya.Home) [174.29.44.154]:51012 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes This changes ppscm_make_pp_type_error_exception to use std::string, removing a cleanup. ChangeLog 2018-05-26 Tom Tromey * guile/scm-pretty-print.c (ppscm_make_pp_type_error_exception): Use string_printf. --- gdb/ChangeLog | 5 +++++ gdb/guile/scm-pretty-print.c | 14 ++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gdb/guile/scm-pretty-print.c b/gdb/guile/scm-pretty-print.c index da1b7d2be1..5e8a2a998d 100644 --- a/gdb/guile/scm-pretty-print.c +++ b/gdb/guile/scm-pretty-print.c @@ -327,16 +327,10 @@ gdbscm_pretty_printer_worker_p (SCM scm) static SCM ppscm_make_pp_type_error_exception (const char *message, SCM object) { - char *msg = xstrprintf ("%s: ~S", message); - struct cleanup *cleanup = make_cleanup (xfree, msg); - SCM exception - = gdbscm_make_error (pp_type_error_symbol, - NULL /* func */, msg, - scm_list_1 (object), scm_list_1 (object)); - - do_cleanups (cleanup); - - return exception; + std::string msg = string_printf ("%s: ~S", message); + return gdbscm_make_error (pp_type_error_symbol, + NULL /* func */, msg.c_str (), + scm_list_1 (object), scm_list_1 (object)); } /* Print MESSAGE as an exception (meaning it is controlled by