From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10273 invoked by alias); 28 Sep 2017 19:50:20 -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 10120 invoked by uid 89); 28 Sep 2017 19:50:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gproxy5-pub.mail.unifiedlayer.com Received: from gproxy5-pub.mail.unifiedlayer.com (HELO gproxy5-pub.mail.unifiedlayer.com) (67.222.38.55) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 28 Sep 2017 19:50:18 +0000 Received: from cmgw4 (unknown [10.0.90.85]) by gproxy5.mail.unifiedlayer.com (Postfix) with ESMTP id 966BB14054A for ; Thu, 28 Sep 2017 13:50:17 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id F7qE1w00i2f2jeq017qHvf; Thu, 28 Sep 2017 13:50:17 -0600 X-Authority-Analysis: v=2.2 cv=OZLoNlbY c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=2JCJgTwv5E4A:10 a=zstS-IiYAAAA:8 a=GMNua8mfFLH_xF9bysoA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 75-166-0-208.hlrn.qwest.net ([75.166.0.208]:56208 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1dxep4-003LpU-7Q; Thu, 28 Sep 2017 13:50:14 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 03/12] Remove cleanups from utils.c Date: Thu, 28 Sep 2017 19:50:00 -0000 Message-Id: <20170928195011.27382-4-tom@tromey.com> In-Reply-To: <20170928195011.27382-1-tom@tromey.com> References: <20170928195011.27382-1-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1dxep4-003LpU-7Q X-Source-Sender: 75-166-0-208.hlrn.qwest.net (bapiya.Home) [75.166.0.208]:56208 X-Source-Auth: tom+tromey.com X-Email-Count: 4 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes X-SW-Source: 2017-09/txt/msg00874.txt.bz2 This removes a couple of cleanups from utils.c through the use of std::string. gdb/ChangeLog 2017-09-28 Tom Tromey * utils.c (vfprintf_maybe_filtered): Use std::string. (vfprintf_unfiltered): Likewise. --- gdb/ChangeLog | 5 +++++ gdb/utils.c | 23 +++++++---------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/gdb/utils.c b/gdb/utils.c index 24294be..dbd56b2 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -2036,13 +2036,8 @@ static void vfprintf_maybe_filtered (struct ui_file *stream, const char *format, va_list args, int filter) { - char *linebuffer; - struct cleanup *old_cleanups; - - linebuffer = xstrvprintf (format, args); - old_cleanups = make_cleanup (xfree, linebuffer); - fputs_maybe_filtered (linebuffer, stream, filter); - do_cleanups (old_cleanups); + std::string linebuffer (string_vprintf (format, args)); + fputs_maybe_filtered (linebuffer.c_str (), stream, filter); } @@ -2055,11 +2050,7 @@ vfprintf_filtered (struct ui_file *stream, const char *format, va_list args) void vfprintf_unfiltered (struct ui_file *stream, const char *format, va_list args) { - char *linebuffer; - struct cleanup *old_cleanups; - - linebuffer = xstrvprintf (format, args); - old_cleanups = make_cleanup (xfree, linebuffer); + std::string linebuffer (string_vprintf (format, args)); if (debug_timestamp && stream == gdb_stdlog) { using namespace std::chrono; @@ -2069,18 +2060,18 @@ vfprintf_unfiltered (struct ui_file *stream, const char *format, va_list args) seconds s = duration_cast (now.time_since_epoch ()); microseconds us = duration_cast (now.time_since_epoch () - s); - len = strlen (linebuffer); + len = linebuffer.size (); need_nl = (len > 0 && linebuffer[len - 1] != '\n'); std::string timestamp = string_printf ("%ld.%06ld %s%s", (long) s.count (), (long) us.count (), - linebuffer, need_nl ? "\n": ""); + linebuffer.c_str (), + need_nl ? "\n": ""); fputs_unfiltered (timestamp.c_str (), stream); } else - fputs_unfiltered (linebuffer, stream); - do_cleanups (old_cleanups); + fputs_unfiltered (linebuffer.c_str (), stream); } void -- 2.9.5