From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from progateway7-pub.mail.pro1.eigbox.com (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55]) by sourceware.org (Postfix) with ESMTPS id 98C773858400 for ; Sat, 22 Jan 2022 01:38:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 98C773858400 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 cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway7.mail.pro1.eigbox.com (Postfix) with ESMTP id B3B8E10047C08 for ; Sat, 22 Jan 2022 01:38:06 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id B5LynUHMJwm8iB5LynTIQC; Sat, 22 Jan 2022 01:38:06 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=DpSTREz+ c=1 sm=1 tr=0 ts=61eb5ffe 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=LKTJKE58X9wmvd6fe_oA: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=seQAlOahph3Tw5173emNAWgpebpGzoUcikb4Gew8o9E=; b=JLsiP17UZV/R1XszR+eYPq2oHl tuAvBfgmslji5JrR98XFoXIBjGTZqLvg1caMO1w8dVUlvkCyTp5oTJmsn7dQulKjlaP7O+ohhH0Fw q2fC56d792PBBYB8ltDPE+kAS; 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 1nB5Lx-001DeE-Pv; Fri, 21 Jan 2022 18:38:05 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 03/19] Only have one API for unfiltered output Date: Fri, 21 Jan 2022 18:37:45 -0700 Message-Id: <20220122013801.666659-4-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: 1nB5Lx-001DeE-Pv 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: 4 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, 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:09 -0000 At the end of this series, the use of unfiltered output will be very restricted -- only places that definitely need it will use it. To this end, I thought it would be good to reduce the number of _unfiltered APIs that are exposed. This patch changes gdb so that only printf_unfiltered exists. (After this patch, the f* variants still exist as well, but those will be removed later.) --- gdb/event-top.c | 6 +----- gdb/top.c | 8 ++------ gdb/utils.c | 12 ------------ gdb/utils.h | 4 ---- 4 files changed, 3 insertions(+), 27 deletions(-) diff --git a/gdb/event-top.c b/gdb/event-top.c index 0e22f24f1df..039066a9d03 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -673,11 +673,7 @@ handle_line_of_input (struct buffer *cmd_line_buffer, cmd_line_buffer->used_size = 0; if (from_tty && annotation_level > 1) - { - printf_unfiltered (("\n\032\032post-")); - puts_unfiltered (annotation_suffix); - printf_unfiltered (("\n")); - } + printf_unfiltered (("\n\032\032post-%s\n"), annotation_suffix); #define SERVER_COMMAND_PREFIX "server " server_command = startswith (cmd, SERVER_COMMAND_PREFIX); diff --git a/gdb/top.c b/gdb/top.c index a94ed5cebdb..5d90ebbdf19 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -873,7 +873,7 @@ gdb_readline_no_editing (const char *prompt) /* Don't use a _filtered function here. It causes the assumed character position to be off, since the newline we read from the user is not accounted for. */ - puts_unfiltered (prompt); + printf_unfiltered ("%s", prompt); gdb_flush (gdb_stdout); } @@ -1372,11 +1372,7 @@ command_line_input (const char *prompt_arg, const char *annotation_suffix) ++source_line_number; if (from_tty && annotation_level > 1) - { - puts_unfiltered ("\n\032\032pre-"); - puts_unfiltered (annotation_suffix); - puts_unfiltered ("\n"); - } + printf_unfiltered ("\n\032\032pre-%s\n", annotation_suffix); /* Don't use fancy stuff if not talking to stdin. */ if (deprecated_readline_hook diff --git a/gdb/utils.c b/gdb/utils.c index f64ff68fa0d..48d68c6739d 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1867,12 +1867,6 @@ fputs_highlighted (const char *str, const compiled_regex &highlight, fputs_filtered (str, stream); } -int -putchar_unfiltered (int c) -{ - return fputc_unfiltered (c, gdb_stdout); -} - /* Write character C to gdb_stdout using GDB's paging mechanism and return C. May return nonlocally. */ @@ -2045,12 +2039,6 @@ puts_filtered (const char *string) fputs_filtered (string, gdb_stdout); } -void -puts_unfiltered (const char *string) -{ - fputs_unfiltered (string, gdb_stdout); -} - /* Return a pointer to N spaces and a null. The pointer is good until the next call to here. */ const char * diff --git a/gdb/utils.h b/gdb/utils.h index 83211a008f1..e506650cbdd 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -240,12 +240,8 @@ extern int fputc_unfiltered (int c, struct ui_file *); extern int putchar_filtered (int c); -extern int putchar_unfiltered (int c); - extern void puts_filtered (const char *); -extern void puts_unfiltered (const char *); - extern void puts_filtered_tabular (char *string, int width, int right); extern void vprintf_filtered (const char *, va_list) ATTRIBUTE_PRINTF (1, 0); -- 2.31.1