From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy1-pub.mail.unifiedlayer.com (gproxy1-pub.mail.unifiedlayer.com [69.89.25.95]) by sourceware.org (Postfix) with ESMTPS id 68C09385B805 for ; Thu, 17 Feb 2022 22:05:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 68C09385B805 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 progateway3.mail.pro1.eigbox.com (Postfix) with ESMTP id D497510048A27 for ; Thu, 17 Feb 2022 22:05:53 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id KouPn7CT8kku4KouPnOTtr; Thu, 17 Feb 2022 22:05:53 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=LOaj/La9 c=1 sm=1 tr=0 ts=620ec6c1 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=05vw_zCCox0F7d-TGCMA:9 a=+jEqtf1s3R9VXZ0wqowq2kgwd+I=:19 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=NN983/nXleELXzDehq8BwCKuQfyGyOA2HShZIqH12iI=; b=QcEjlgwK5GGrs1sww129WVTkwB 69K3U4ffPBGnVYSOSr/YiIXxP+C5BlIz4gAvmqeBsryKarWhMhOKrrSx8pyGyT6g3w9EZFVmqG0rt TDivuM/yCc9pBZ4g+Rp9mQUCN; Received: from 75-166-146-214.hlrn.qwest.net ([75.166.146.214]:41038 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 1nKouO-002ABb-VV; Thu, 17 Feb 2022 15:05:53 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 13/18] Change generic_emit_char to print the quotes Date: Thu, 17 Feb 2022 15:05:41 -0700 Message-Id: <20220217220547.3874030-14-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220217220547.3874030-1-tom@tromey.com> References: <20220217220547.3874030-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.146.214 X-Source-L: No X-Exim-ID: 1nKouO-002ABb-VV X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-146-214.hlrn.qwest.net (prentzel.Home) [75.166.146.214]:41038 X-Source-Auth: tom+tromey.com X-Email-Count: 19 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, 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: Thu, 17 Feb 2022 22:05:56 -0000 All callers of generic_emit_char print the quotes around the character, then pass the quote character to the function. It seemed better to just have generic_emit_char print the quotes itself. --- gdb/c-lang.c | 2 -- gdb/f-lang.h | 2 -- gdb/valprint.c | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gdb/c-lang.c b/gdb/c-lang.c index f7dee8c31d8..b8097eb8c07 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -164,9 +164,7 @@ language_defn::printchar (int c, struct type *type, break; } - fputc_filtered ('\'', stream); generic_emit_char (c, type, stream, '\'', encoding); - fputc_filtered ('\'', stream); } /* Print the character string STRING, printing at most LENGTH diff --git a/gdb/f-lang.h b/gdb/f-lang.h index 388c832dcdb..fc2cdc1786b 100644 --- a/gdb/f-lang.h +++ b/gdb/f-lang.h @@ -152,10 +152,8 @@ class f_language : public language_defn void printchar (int ch, struct type *chtype, struct ui_file *stream) const override { - fputs_filtered ("'", stream); const char *encoding = get_encoding (chtype); generic_emit_char (ch, chtype, stream, '\'', encoding); - fputs_filtered ("'", stream); } /* See language.h. */ diff --git a/gdb/valprint.c b/gdb/valprint.c index 39c75e82a71..f873377fc8c 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -2295,6 +2295,7 @@ generic_emit_char (int c, struct type *type, struct ui_file *stream, c_buf = (gdb_byte *) alloca (TYPE_LENGTH (type)); pack_long (c_buf, type, c); + fputc_filtered (quoter, stream); wchar_iterator iter (c_buf, TYPE_LENGTH (type), encoding, TYPE_LENGTH (type)); /* This holds the printable form of the wchar_t data. */ @@ -2356,6 +2357,7 @@ generic_emit_char (int c, struct type *type, struct ui_file *stream, obstack_1grow (&output, '\0'); fputs_filtered ((const char *) obstack_base (&output), stream); + fputc_filtered (quoter, stream); } /* Return the repeat count of the next character/byte in ITER, -- 2.31.1