From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=nabijaczleweli.xyz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nabijaczleweli.xyz DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz; s=202305; t=1690133564; bh=BiPm7wcQyiwAHYyN0ZyOka7Z25CXOirIPPBQzkdV2vw=; h=Date:From:To:Cc:Subject:From; b=dx8zbutbfcFJehfQ2AN0a9l9jMZV7ZoO4/J172HfEsW06DKrJycZsR9p8N+bL5BGH auMCPP85BLdArD7zLikgffi5gZlFrW9KZhAkmwrNt8x4Au2DLOZL8E99rWI5vvZuAJ sy7WuCsZRkWziGSQ2YL9bynRyYdX5400YBjtyPzZ5BW9U2XpAiQeASgAtTeZiH2C1T S9IFvCbFP8f/yTqJx3p9Sg4x5+IKqm6etNu9J++B+KR+oh7Jz5RHqYaK9quC3Ad1lq r8w2qsI/zShoRT6ZMRXdXQIIP4s2L6am6h1BJnfXOtw9TFv++OE7xsCyPm7GOUUrgO rKzZ2Jyhjuw9g== 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 From: =?utf-8?B?0L3QsNCx?= 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-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="kwl2savz5ahzhchf" 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 List-Id: --kwl2savz5ahzhchf Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The only user of this typo, sans the ChangeLogs. Reported-by: Bruno Haible Signed-off-by: Ahelenia Ziemia=C5=84ska --- 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,= "=3DINTERNAL->utf8", __gconv_transform_internal_utf8, NULL, 4, 4, 1, 6) =20 BUILTIN_TRANSFORMATION ("ISO-10646/UTF8/", "INTERNAL", 1, "=3Dutf8->INTERN= AL", - __gconv_transform_utf8_internal, __gconv_btwoc_ascii, + __gconv_transform_utf8_internal, __gconv_btowc_ascii, 1, 6, 4, 4) =20 BUILTIN_ALIAS ("UCS2//", "ISO-10646/UCS2/") @@ -82,7 +82,7 @@ BUILTIN_ALIAS ("CSASCII//", "ANSI_X3.4-1968//") BUILTIN_ALIAS ("OSF00010020//", "ANSI_X3.4-1968//") =20 BUILTIN_TRANSFORMATION ("ANSI_X3.4-1968//", "INTERNAL", 1, "=3Dascii->INTE= RNAL", - __gconv_transform_ascii_internal, __gconv_btwoc_ascii, + __gconv_transform_ascii_internal, __gconv_btowc_ascii, 1, 1, 4, 4) =20 BUILTIN_TRANSFORMATION ("INTERNAL", "ANSI_X3.4-1968//", 1, "=3DINTERNAL->a= scii", 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); =20 /* Specialized conversion function for a single byte to INTERNAL, recogniz= ing only ASCII characters. */ -extern wint_t __gconv_btwoc_ascii (struct __gconv_step *step, unsigned cha= r c); +extern wint_t __gconv_btowc_ascii (struct __gconv_step *step, unsigned cha= r c); =20 #endif =20 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, recogniz= ing 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 =3D .__from_name =3D (char *) "ANSI_X3.4-1968//TRANSLIT", .__to_name =3D (char *) "INTERNAL", .__fct =3D __gconv_transform_ascii_internal, - .__btowc_fct =3D __gconv_btwoc_ascii, + .__btowc_fct =3D __gconv_btowc_ascii, .__init_fct =3D NULL, .__end_fct =3D NULL, .__min_needed_from =3D 1, --=20 2.39.2 --kwl2savz5ahzhchf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmS9ZDgACgkQvP0LAY0m WPGmPQ/+JiULxCQCvR8n/S1KP+ilAksdRrDJADffndOzXr5YsdZCUo2uwczDboHG WA1awmQF7VY+6zQI6Ejd+uoAApMVFJxkODfyDr6CgIqprlTXDA5YsMvtobGPg7lK /oFFSbEsXiVRtC+HkPq1bBWA96WgASadHs1DzZim4AJvNNPxW5ca3/npnjbtWvuA b7wVuYx/os3QCNlU076Da6FhXED0AdiJ0d7iyDixK2Zs+gvq/6Og9EDgXGTHdFHq sYTzrNvrc1MU2lFyvTeJL2zu2WQvgifFfrNnzEKVcHXICI1h7rDXjaGQ0CL7kGaE Qp8AIkRPb0DdV6BSzxTDDbNK0x0BuFNXC+B2wZjSTjPFVNqwgHgrVoa7Tf9XpWpj I7lR261SL2w8LLQ+jv2JPPbhVAgBeoF1gCSRziOrUakPTjeVu6lyL5a4cVhi5xPW Tz4ALXkmxksPJfMLUO9WB/WRl8ryBq7kLZf0ARJ8JoRP29expyUlRl5PoooOAKNI qV4rjODGG/oLutWq/Nei4AwKaTX0XduhuKfe0W62GJ8vbXhmAHwtWCxZvt7pGGGd CN/O1irbifPzpc1GwrQGiuwhsFBe+ytpX/mDid5IjTTgeeXLGA0+6jXF2uaOSNSb TtTHz67plmEW34FfSLkR0idA4sTa5PGekf1GTw9L2WE5dy8qzfo= =HlCU -----END PGP SIGNATURE----- --kwl2savz5ahzhchf--