From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from qproxy6-pub.mail.unifiedlayer.com (qproxy6-pub.mail.unifiedlayer.com [69.89.23.12]) by sourceware.org (Postfix) with ESMTPS id 5A4F03858427 for ; Sat, 22 Jan 2022 01:38:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5A4F03858427 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from gproxy2-pub.mail.unifiedlayer.com (unknown [69.89.18.3]) by qproxy6.mail.unifiedlayer.com (Postfix) with ESMTP id 8616E803217C for ; Sat, 22 Jan 2022 01:38:38 +0000 (UTC) Received: from cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway4.mail.pro1.eigbox.com (Postfix) with ESMTP id 513A710048372 for ; Sat, 22 Jan 2022 01:38:08 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id B5Lzn5oltEaNCB5LznzZgA; Sat, 22 Jan 2022 01:38:08 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=dJtjJMVb c=1 sm=1 tr=0 ts=61eb6000 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=DghFqjY3_ZEA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=CjMrXGH3qiYbZkg3YjwA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=IPT0+fjrwFZlszeXvRI5T0gIjcwvkMj2isaV7jYsPWo=; b=h6ueBCWLn8lsfLdM/ndzObcw5n hsjFhbjFnt55qA/2VBGVC2ftf5US1da4Himee6EvvAjoWCMuNQMP501fWniPtcxyMe0ipuaVftg8r EEAUJznKjrNWjrpP1Y/V77LNJ; Received: from 75-166-128-165.hlrn.qwest.net ([75.166.128.165]:40602 helo=prentzel.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nB5Ly-001DeE-LP; Fri, 21 Jan 2022 18:38:06 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 06/19] Remove vfprintf_styled_no_gdbfmt Date: Fri, 21 Jan 2022 18:37:48 -0700 Message-Id: <20220122013801.666659-7-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220122013801.666659-1-tom@tromey.com> References: <20220122013801.666659-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.128.165 X-Source-L: No X-Exim-ID: 1nB5Ly-001DeE-LP X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-128-165.hlrn.qwest.net (prentzel.Home) [75.166.128.165]:40602 X-Source-Auth: tom+tromey.com X-Email-Count: 7 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Jan 2022 01:38:43 -0000 This removes vfprintf_styled_no_gdbfmt, inlining it at the sole point of call. --- gdb/cli-out.c | 13 ++++++++----- gdb/utils.c | 15 --------------- gdb/utils.h | 8 -------- 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/gdb/cli-out.c b/gdb/cli-out.c index b2daad11a51..a7fcc623897 100644 --- a/gdb/cli-out.c +++ b/gdb/cli-out.c @@ -230,11 +230,14 @@ cli_ui_out::do_message (const ui_file_style &style, if (m_suppress_output) return; - /* Use the "no_gdbfmt" variant here to avoid recursion. - vfprintf_styled calls into cli_ui_out::message to handle the - gdb-specific printf formats. */ - vfprintf_styled_no_gdbfmt (m_streams.back (), style, - !test_flags (unfiltered_output), format, args); + std::string str = string_vprintf (format, args); + if (!str.empty ()) + { + if (test_flags (unfiltered_output)) + fputs_styled_unfiltered (str.c_str (), style, m_streams.back ()); + else + fputs_styled (str.c_str (), style, m_streams.back ()); + } } void diff --git a/gdb/utils.c b/gdb/utils.c index 65b7668f583..6dbb46f9719 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1992,21 +1992,6 @@ vfprintf_styled (struct ui_file *stream, const ui_file_style &style, set_output_style (stream, ui_file_style ()); } -/* See utils.h. */ - -void -vfprintf_styled_no_gdbfmt (struct ui_file *stream, const ui_file_style &style, - bool filter, const char *format, va_list args) -{ - std::string str = string_vprintf (format, args); - if (!str.empty ()) - { - set_output_style (stream, style); - fputs_maybe_filtered (str.c_str (), stream, filter); - set_output_style (stream, ui_file_style ()); - } -} - void printf_filtered (const char *format, ...) { diff --git a/gdb/utils.h b/gdb/utils.h index e506650cbdd..5d8ed670e66 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -286,14 +286,6 @@ extern void vfprintf_styled (struct ui_file *stream, va_list args) ATTRIBUTE_PRINTF (3, 0); -/* Like vfprintf_styled, but do not process gdb-specific format - specifiers. */ -extern void vfprintf_styled_no_gdbfmt (struct ui_file *stream, - const ui_file_style &style, - bool filter, - const char *fmt, va_list args) - ATTRIBUTE_PRINTF (4, 0); - /* Like fputs_filtered, but styles the output according to STYLE, when appropriate. */ -- 2.31.1