diff mbox series

[v18,1/3] iconv: __gconv_btwoc_ascii -> __gconv_btowc_ascii

Message ID e4748b3c5f06edfa928a649c99b6ea8dddb799f9.1690133538.git.nabijaczleweli@nabijaczleweli.xyz
State New
Headers
Series [v18,1/3] iconv: __gconv_btwoc_ascii -> __gconv_btowc_ascii |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Testing passed

Commit Message

Ahelenia Ziemiańska July 23, 2023, 5:32 p.m. UTC 
  The only user of this typo, sans the ChangeLogs.

Reported-by: Bruno Haible <bruno@clisp.org>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
---
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 mbox series

Patch

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,