From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy4-pub.mail.unifiedlayer.com (gproxy4-pub.mail.unifiedlayer.com [69.89.23.142]) by sourceware.org (Postfix) with ESMTPS id A7EFE3857412 for ; Thu, 17 Feb 2022 22:05:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A7EFE3857412 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 cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway6.mail.pro1.eigbox.com (Postfix) with ESMTP id 1FF9510047FA3 for ; Thu, 17 Feb 2022 22:05:53 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id KouOnRtLPEaNCKouOnNVf2; Thu, 17 Feb 2022 22:05:53 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=fNX8YbWe 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=_DzFNbSs_1NzKnJzCdMA: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=vpjmpCvSdtBgvPnZWjAG6MAqNi22klJjEakDOnD7IU0=; b=Oa2RJ9JzPOI5ZvGQR29cW9qX8e JMSJCqvHx/5p+JHWaKAI+SmQJvNbEe91TLng7dXygG8yIAMyCZv8I8SSEdslvccw3anMd22MunSI+ n0Y1xm4y9mwaKWznruTNeBtpY; 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-6z; Thu, 17 Feb 2022 15:05:52 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 10/18] Use a ui_file in print_wchar Date: Thu, 17 Feb 2022 15:05:38 -0700 Message-Id: <20220217220547.3874030-11-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-6z 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: 16 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.4 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, 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:55 -0000 This introduces a new ui_file subclass, that turns a host string into a wide string and appends it to an obstack. print_wchar is rewritten to use this new ui_file. This will be more useful in a later patch. --- gdb/valprint.c | 52 ++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/gdb/valprint.c b/gdb/valprint.c index 57201164c87..2d90f61e297 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -2163,19 +2163,29 @@ wchar_printable (gdb_wchar_t w) || w == LCST ('\v') || w == LCST ('\0')); } -/* A helper function that converts the contents of STRING to wide - characters and then appends them to OUTPUT. */ - -static void -append_string_as_wide (const char *string, - struct obstack *output) -{ - for (; *string; ++string) - { - gdb_wchar_t w = gdb_btowc (*string); - obstack_grow (output, &w, sizeof (gdb_wchar_t)); - } -} +/* A ui_file that writes wide characters to an obstack. */ +class obstack_wide_file : public ui_file +{ +public: + explicit obstack_wide_file (struct obstack *output) + : m_output (output) + { + } + + ~obstack_wide_file () = default; + + void write (const char *buf, long length_buf) override + { + for (long i = 0; i < length_buf; ++i) + { + gdb_wchar_t w = gdb_btowc (buf[i]); + obstack_grow (m_output, &w, sizeof (gdb_wchar_t)); + } + } + +private: + struct obstack *m_output; +}; /* Print a wide character W to OUTPUT. ORIG is a pointer to the original (target) bytes representing the character, ORIG_LEN is the @@ -2233,10 +2243,10 @@ print_wchar (gdb_wint_t w, const gdb_byte *orig, else { int i; + obstack_wide_file file (output); for (i = 0; i + width <= orig_len; i += width) { - char octal[30]; ULONGEST value; value = extract_unsigned_integer (&orig[i], width, @@ -2245,28 +2255,20 @@ print_wchar (gdb_wint_t w, const gdb_byte *orig, way. Otherwise, print it as a hex escape. */ if (value <= 0777) { - xsnprintf (octal, sizeof (octal), "\\%.3o", - (int) (value & 0777)); + fprintf_filtered (&file, "\\%.3o", (int) (value & 0777)); *need_escapep = false; } else { - xsnprintf (octal, sizeof (octal), "\\x%lx", (long) value); - /* A hex escape might require the next character - to be escaped, because, unlike with octal, - hex escapes have no length limit. */ + fprintf_filtered (&file, "\\x%lx", (long) value); *need_escapep = true; } - append_string_as_wide (octal, output); } /* If we somehow have extra bytes, print them now. */ while (i < orig_len) { - char octal[5]; - - xsnprintf (octal, sizeof (octal), "\\%.3o", orig[i] & 0xff); + fprintf_filtered (&file, "\\%.3o", orig[i] & 0xff); *need_escapep = false; - append_string_as_wide (octal, output); ++i; } } -- 2.31.1