From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from outbound-ss-820.bluehost.com (outbound-ss-820.bluehost.com [69.89.24.241]) by sourceware.org (Postfix) with ESMTPS id 51011385840E for ; Sat, 22 Jan 2022 01:38:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 51011385840E 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 cmgw12.mail.unifiedlayer.com (unknown [10.0.90.127]) by progateway2.mail.pro1.eigbox.com (Postfix) with ESMTP id B500B10047DBF for ; Sat, 22 Jan 2022 01:38:11 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id B5M3nH4YqXOyfB5M3nEVQT; Sat, 22 Jan 2022 01:38:11 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=Ot6Kdwzt c=1 sm=1 tr=0 ts=61eb6003 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=swqUslqM1kBYcLLRApMA: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=3g14LPK+//fjFzRao4HsrSD9lYro2lO1c2fGlARTJzA=; b=epYoEUinrL5P68DxdYJm5WoFIg OiGkuOy+Jg3TocV1rPr2POOM+/jc+Q3vWSdM3guxlrJzl6PNcf/e9vn4bjErsbf4Z20514iH5DnTv 2Op3PEVOM02z26vSLfaep35l0; Received: from 75-166-128-165.hlrn.qwest.net ([75.166.128.165]:40604 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 1nB5M2-001DkZ-R1; Fri, 21 Jan 2022 18:38:10 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 14/19] Rename puts_filtered_tabular Date: Fri, 21 Jan 2022 18:37:56 -0700 Message-Id: <20220122013801.666659-15-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: 1nB5M2-001DkZ-R1 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-128-165.hlrn.qwest.net (prentzel.Home) [75.166.128.165]:40604 X-Source-Auth: tom+tromey.com X-Email-Count: 15 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.5 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:14 -0000 puts_filtered_tabular is now misnamed, because whether filtering happens is now up to the stream. So, rename it. (This function is pretty weird, and should probably be rewritten to avoid using the chars_printed global, and moved into objc-lang.c. However, I haven't done so.) --- gdb/objc-lang.c | 4 ++-- gdb/utils.c | 13 ++++++------- gdb/utils.h | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index 0ef1973a6f9..9a834ff504a 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -666,7 +666,7 @@ info_selectors_command (const char *regexp, int from_tty) *p++ = *name++; *p++ = '\0'; /* Print in columns. */ - puts_filtered_tabular(asel, maxlen + 1, 0); + puts_tabular(asel, maxlen + 1, 0); } begin_line(); } @@ -800,7 +800,7 @@ info_classes_command (const char *regexp, int from_tty) *p++ = *name++; *p++ = '\0'; /* Print in columns. */ - puts_filtered_tabular(aclass, maxlen + 1, 0); + puts_tabular(aclass, maxlen + 1, 0); } begin_line(); } diff --git a/gdb/utils.c b/gdb/utils.c index 46b061ea6cf..d00f72ba0a5 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1504,15 +1504,14 @@ pager_file::wrap_here (int indent) } } -/* Print input string to gdb_stdout, filtered, with wrap, - arranging strings in columns of n chars. String can be - right or left justified in the column. Never prints - trailing spaces. String should never be longer than - width. FIXME: this could be useful for the EXAMINE - command, which currently doesn't tabulate very well. */ +/* Print input string to gdb_stdout arranging strings in columns of n + chars. String can be right or left justified in the column. Never + prints trailing spaces. String should never be longer than width. + FIXME: this could be useful for the EXAMINE command, which + currently doesn't tabulate very well. */ void -puts_filtered_tabular (char *string, int width, int right) +puts_tabular (char *string, int width, int right) { int spaces = 0; int stringlen; diff --git a/gdb/utils.h b/gdb/utils.h index e43ce3bcbd0..e899e899238 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -238,7 +238,7 @@ extern int gdb_putc (int c); extern void gdb_puts (const char *); -extern void puts_filtered_tabular (char *string, int width, int right); +extern void puts_tabular (char *string, int width, int right); extern void gdb_vprintf (const char *, va_list) ATTRIBUTE_PRINTF (1, 0); -- 2.31.1