From patchwork Sun Jul 23 17:32:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ahelenia_Ziemia=C5=84ska?= X-Patchwork-Id: 73101 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A84F2385770A for ; Sun, 23 Jul 2023 17:33:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A84F2385770A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690133588; bh=xYPRLYKzVp5Kjx3drehyUUVM+CHoaFzguIeyhOTsJdg=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=qNCNoO8Z1rCFrDhCCPEFp/dwyIyQF+JzkVm/8Kp22TLJ5J8BrzkbWuVT7pnYpAoJR BNvPoKxOG8XeXl8K3dGO6iAFzYCQ5jdwXw++lDyEGrUME4GMQkYRzSKpBARSe/E1b7 JHJAjeE418sh128siCr7aMfyeUxGH5X06rqK2aFU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from tarta.nabijaczleweli.xyz (unknown [139.28.40.42]) by sourceware.org (Postfix) with ESMTP id 6E2FF3858D28 for ; Sun, 23 Jul 2023 17:32:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6E2FF3858D28 Received: from tarta.nabijaczleweli.xyz (unknown [192.168.1.250]) by tarta.nabijaczleweli.xyz (Postfix) with ESMTPSA id 8BE0037F0; Sun, 23 Jul 2023 19:32:44 +0200 (CEST) Date: Sun, 23 Jul 2023 19:32:43 +0200 To: Florian Weimer Cc: libc-alpha@sourceware.org, Victor Stinner , Bruno Haible Subject: [PATCH v18 1/3] iconv: __gconv_btwoc_ascii -> __gconv_btowc_ascii Message-ID: MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20230517 X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_INFOUSMEBIZ, RDNS_DYNAMIC, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?b?0L3QsNCxIHZpYSBMaWJjLWFscGhh?= From: =?utf-8?q?Ahelenia_Ziemia=C5=84ska?= Reply-To: =?utf-8?b?0L3QsNCx?= Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The only user of this typo, sans the ChangeLogs. Reported-by: Bruno Haible Signed-off-by: Ahelenia Ziemiańska --- Clean rebase of 1/3. iconv/gconv_builtin.h | 4 ++-- iconv/gconv_int.h | 2 +- iconv/gconv_simple.c | 2 +- wcsmbs/wcsmbsload.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/iconv/gconv_builtin.h b/iconv/gconv_builtin.h index 35608b4461..2f560a924a 100644 --- a/iconv/gconv_builtin.h +++ b/iconv/gconv_builtin.h @@ -52,7 +52,7 @@ BUILTIN_TRANSFORMATION ("INTERNAL", "ISO-10646/UTF8/", 1, "=INTERNAL->utf8", __gconv_transform_internal_utf8, NULL, 4, 4, 1, 6) BUILTIN_TRANSFORMATION ("ISO-10646/UTF8/", "INTERNAL", 1, "=utf8->INTERNAL", - __gconv_transform_utf8_internal, __gconv_btwoc_ascii, + __gconv_transform_utf8_internal, __gconv_btowc_ascii, 1, 6, 4, 4) BUILTIN_ALIAS ("UCS2//", "ISO-10646/UCS2/") @@ -82,7 +82,7 @@ BUILTIN_ALIAS ("CSASCII//", "ANSI_X3.4-1968//") BUILTIN_ALIAS ("OSF00010020//", "ANSI_X3.4-1968//") BUILTIN_TRANSFORMATION ("ANSI_X3.4-1968//", "INTERNAL", 1, "=ascii->INTERNAL", - __gconv_transform_ascii_internal, __gconv_btwoc_ascii, + __gconv_transform_ascii_internal, __gconv_btowc_ascii, 1, 1, 4, 4) BUILTIN_TRANSFORMATION ("INTERNAL", "ANSI_X3.4-1968//", 1, "=INTERNAL->ascii", diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h index 19d042faff..e3baec97f0 100644 --- a/iconv/gconv_int.h +++ b/iconv/gconv_int.h @@ -325,7 +325,7 @@ __BUILTIN_TRANSFORM (__gconv_transform_utf16_internal); /* Specialized conversion function for a single byte to INTERNAL, recognizing only ASCII characters. */ -extern wint_t __gconv_btwoc_ascii (struct __gconv_step *step, unsigned char c); +extern wint_t __gconv_btowc_ascii (struct __gconv_step *step, unsigned char c); #endif diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c index e936e171d7..17788383f4 100644 --- a/iconv/gconv_simple.c +++ b/iconv/gconv_simple.c @@ -45,7 +45,7 @@ /* Specialized conversion function for a single byte to INTERNAL, recognizing only ASCII characters. */ wint_t -__gconv_btwoc_ascii (struct __gconv_step *step, unsigned char c) +__gconv_btowc_ascii (struct __gconv_step *step, unsigned char c) { if (c < 0x80) return c; diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c index 7b338b6775..61392e0b1e 100644 --- a/wcsmbs/wcsmbsload.c +++ b/wcsmbs/wcsmbsload.c @@ -36,7 +36,7 @@ static const struct __gconv_step to_wc = .__from_name = (char *) "ANSI_X3.4-1968//TRANSLIT", .__to_name = (char *) "INTERNAL", .__fct = __gconv_transform_ascii_internal, - .__btowc_fct = __gconv_btwoc_ascii, + .__btowc_fct = __gconv_btowc_ascii, .__init_fct = NULL, .__end_fct = NULL, .__min_needed_from = 1,