From patchwork Fri Aug 10 21:48:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 28846 Received: (qmail 85224 invoked by alias); 10 Aug 2018 21:48:48 -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 85120 invoked by uid 89); 10 Aug 2018 21:48:47 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy=UD:length X-HELO: sesbmg22.ericsson.net Received: from sesbmg22.ericsson.net (HELO sesbmg22.ericsson.net) (193.180.251.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 10 Aug 2018 21:48:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; d=ericsson.com; s=mailgw201801; c=relaxed/simple; q=dns/txt; i=@ericsson.com; t=1533937719; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:CC:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=o/ORJSV0i9bQxhZIiS7kAn/oJoG4kMfMWvwSzVpPDcg=; b=SZSXArtYOB/EVy7C6if2WS9VhHa/t90bNj8BgAd8eeMca+vkuMGXVE9HH2dg5kbn JJXa0MhbooGDbgMPRSnJs8FyRwVQEd3jrqDYWDf7HJDwL8ZCoXZuHnIuwjMLB8PY Go0/hXBd1hryXm0tuWKrzaeny6dC+UJilLPNFnkOWr4=; Received: from ESESSMB502.ericsson.se (Unknown_Domain [153.88.183.120]) by sesbmg22.ericsson.net (Symantec Mail Security) with SMTP id C9.84.21978.7380E6B5; Fri, 10 Aug 2018 23:48:39 +0200 (CEST) Received: from ESESBMB505.ericsson.se (153.88.183.172) by ESESSMB502.ericsson.se (153.88.183.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Fri, 10 Aug 2018 23:48:39 +0200 Received: from NAM05-CO1-obe.outbound.protection.outlook.com (153.88.183.157) by ESESBMB505.ericsson.se (153.88.183.172) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3 via Frontend Transport; Fri, 10 Aug 2018 23:48:39 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ericsson.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oY91G7fD3R1L3tY26N3mu+V0PgsKPh8u+JXVi3dxA4U=; b=YV9wqhX69zKyOZfq0hre9ESahQy462Nq+YYgAa67F/FBbaI4VDctbtkLT+PwLDOUNTLw/C/RROo97qqM+o8/VkfqBs3PYWL8cd/c8Kf/yYpWqVvXUGTofkFSMRGG+/ou7kXm2SNOW3BZv5EV/indK43tINQWQQw07Ve/SwnSVbc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by DM6PR15MB2395.namprd15.prod.outlook.com (2603:10b6:5:8d::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1038.23; Fri, 10 Aug 2018 21:48:36 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] Replace xstrvprintf usages with string_vprintf Date: Fri, 10 Aug 2018 17:48:27 -0400 Message-Id: <1533937707-18515-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 Return-Path: simon.marchi@ericsson.com Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-IsSubscribed: yes From: Simon Marchi Most usages of xstrvprintf in GDB can be replaced with string_vprintf, removing some manual memory management. gdb/ChangeLog: * guile/scm-string.c (gdbscm_scm_from_printf): Use string_vprintf. * guile/scm-utils.c (gdbscm_printf): Likewise. * serial.c (serial_printf): Likewise. * xml-support.c (gdb_xml_parser::vdebug): Likewise. --- gdb/guile/scm-string.c | 6 ++---- gdb/guile/scm-utils.c | 6 ++---- gdb/serial.c | 8 +++----- gdb/xml-support.c | 8 +++----- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/gdb/guile/scm-string.c b/gdb/guile/scm-string.c index 5779509..d09a54d 100644 --- a/gdb/guile/scm-string.c +++ b/gdb/guile/scm-string.c @@ -62,14 +62,12 @@ SCM gdbscm_scm_from_printf (const char *format, ...) { va_list args; - char *string; SCM result; va_start (args, format); - string = xstrvprintf (format, args); + std::string string = string_vprintf (format, args); va_end (args); - result = scm_from_latin1_string (string); - xfree (string); + result = scm_from_latin1_string (string.c_str ()); return result; } diff --git a/gdb/guile/scm-utils.c b/gdb/guile/scm-utils.c index c24ff20..8f8ed64 100644 --- a/gdb/guile/scm-utils.c +++ b/gdb/guile/scm-utils.c @@ -79,13 +79,11 @@ void gdbscm_printf (SCM port, const char *format, ...) { va_list args; - char *string; va_start (args, format); - string = xstrvprintf (format, args); + std::string string = string_vprintf (format, args); va_end (args); - scm_puts (string, port); - xfree (string); + scm_puts (string.c_str (), port); } /* Utility for calling from gdb to "display" an SCM object. */ diff --git a/gdb/serial.c b/gdb/serial.c index 0239fc8..fb2b212 100644 --- a/gdb/serial.c +++ b/gdb/serial.c @@ -434,16 +434,14 @@ serial_write (struct serial *scb, const void *buf, size_t count) } void -serial_printf (struct serial *desc, const char *format,...) +serial_printf (struct serial *desc, const char *format, ...) { va_list args; - char *buf; va_start (args, format); - buf = xstrvprintf (format, args); - serial_write (desc, buf, strlen (buf)); + std::string buf = string_vprintf (format, args); + serial_write (desc, buf.c_str (), buf.length ()); - xfree (buf); va_end (args); } diff --git a/gdb/xml-support.c b/gdb/xml-support.c index 3775e2c..7c36ca3 100644 --- a/gdb/xml-support.c +++ b/gdb/xml-support.c @@ -179,16 +179,14 @@ void gdb_xml_parser::vdebug (const char *format, va_list ap) { int line = XML_GetCurrentLineNumber (m_expat_parser); - char *message; - message = xstrvprintf (format, ap); + std::string message = string_vprintf (format, ap); if (line) fprintf_unfiltered (gdb_stderr, "%s (line %d): %s\n", - m_name, line, message); + m_name, line, message.c_str ()); else fprintf_unfiltered (gdb_stderr, "%s: %s\n", - m_name, message); - xfree (message); + m_name, message.c_str ()); } void