From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy3-pub.mail.unifiedlayer.com (gproxy3-pub.mail.unifiedlayer.com [69.89.30.42]) by sourceware.org (Postfix) with ESMTPS id ACB55385803D for ; Wed, 16 Feb 2022 13:55:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org ACB55385803D 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 cmgw15.mail.unifiedlayer.com (unknown [10.0.90.130]) by progateway5.mail.pro1.eigbox.com (Postfix) with ESMTP id 0EFA7100563C8 for ; Wed, 16 Feb 2022 13:55:28 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id KKmFnqwAwkku4KKmFn86hE; Wed, 16 Feb 2022 13:55:28 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=LOaj/La9 c=1 sm=1 tr=0 ts=620d0250 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=oGFeUVbbRNcA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=VqoRAeVp4HIFgDOd3z8A: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=akZx6+4fWGsGjntfgMLBFAe6YzdK6/ni4j93BJEEj1g=; b=ofmNT6ueLZRoi9PRfe4GA6EQRi sorQiOL+fGYJefQ7djgVqd4G1SxZtjt52za2ab5Jh4rpC8onxVuo6ixpkVTBMgnqWzcZNElH8olz9 uNNhDuXwIgQY5ZGxUTRJ4Ifyh; Received: from 97-122-95-113.hlrn.qwest.net ([97.122.95.113]:41018 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 1nKKmE-000GMY-Qh; Wed, 16 Feb 2022 06:55:26 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 04/18] Remove c_printstr Date: Wed, 16 Feb 2022 06:55:04 -0700 Message-Id: <20220216135518.3162480-5-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220216135518.3162480-1-tom@tromey.com> References: <20220216135518.3162480-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: 97.122.95.113 X-Source-L: No X-Exim-ID: 1nKKmE-000GMY-Qh X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-95-113.hlrn.qwest.net (prentzel.Home) [97.122.95.113]:41018 X-Source-Auth: tom+tromey.com X-Email-Count: 5 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, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: Wed, 16 Feb 2022 13:55:31 -0000 This renames c_printstr, removing a layer of indirection. --- gdb/c-lang.c | 8 ++++---- gdb/c-lang.h | 8 -------- gdb/language.c | 12 ------------ gdb/rust-lang.c | 5 +++-- 4 files changed, 7 insertions(+), 26 deletions(-) diff --git a/gdb/c-lang.c b/gdb/c-lang.c index 342109c94ef..fbbecb696b9 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -190,10 +190,10 @@ language_defn::printchar (int c, struct type *type, characters, or if FORCE_ELLIPSES. */ void -c_printstr (struct ui_file *stream, struct type *type, - const gdb_byte *string, unsigned int length, - const char *user_encoding, int force_ellipses, - const struct value_print_options *options) +language_defn::printstr (struct ui_file *stream, struct type *type, + const gdb_byte *string, unsigned int length, + const char *user_encoding, int force_ellipses, + const struct value_print_options *options) const { c_string_type str_type; const char *type_encoding; diff --git a/gdb/c-lang.h b/gdb/c-lang.h index 16c9b116393..5441bfe10c7 100644 --- a/gdb/c-lang.h +++ b/gdb/c-lang.h @@ -92,14 +92,6 @@ extern void c_value_print (struct value *, struct ui_file *, extern void c_printchar (int, struct type *, struct ui_file *); -extern void c_printstr (struct ui_file * stream, - struct type *elttype, - const gdb_byte *string, - unsigned int length, - const char *user_encoding, - int force_ellipses, - const struct value_print_options *options); - extern void c_language_arch_info (struct gdbarch *gdbarch, struct language_arch_info *lai); diff --git a/gdb/language.c b/gdb/language.c index 931abcd3076..20b6d8ccf9b 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -635,18 +635,6 @@ language_defn::value_print_inner /* See language.h. */ -void -language_defn::printstr (struct ui_file *stream, struct type *elttype, - const gdb_byte *string, unsigned int length, - const char *encoding, int force_ellipses, - const struct value_print_options *options) const -{ - c_printstr (stream, elttype, string, length, encoding, force_ellipses, - options); -} - -/* See language.h. */ - void language_defn::print_typedef (struct type *type, struct symbol *new_symbol, struct ui_file *stream) const diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 7584d2572fa..3668d2d0c6d 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -283,8 +283,9 @@ rust_language::printstr (struct ui_file *stream, struct type *type, { /* This is probably some C string, so let's let C deal with it. */ - c_printstr (stream, type, string, length, user_encoding, - force_ellipses, options); + this->language_defn::printstr (stream, type, string, length, + user_encoding, force_ellipses, + options); return; } } -- 2.31.1