branch master updated: * tp/Texinfo/XS/main/convert_utils.c (convert_to_utf8, convert_to_utf8_verbatiminclude): Rename function to avoid confusion with convert_to_utf8 in input.c.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new bca2525be8 * tp/Texinfo/XS/main/convert_utils.c (convert_to_utf8, 
convert_to_utf8_verbatiminclude): Rename function to avoid confusion with 
convert_to_utf8 in input.c.
bca2525be8 is described below

commit bca2525be8ee07dadd25a260a4af2cb37d6f476c
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Fri Nov 17 20:40:21 2023 +0000

    * tp/Texinfo/XS/main/convert_utils.c
    (convert_to_utf8, convert_to_utf8_verbatiminclude):
    Rename function to avoid confusion with convert_to_utf8 in input.c.
---
 ChangeLog                          | 6 ++++++
 tp/Texinfo/XS/main/convert_utils.c | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 393ac20bfa..ea678446d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-11-17  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * tp/Texinfo/XS/main/convert_utils.c
+       (convert_to_utf8, convert_to_utf8_verbatiminclude):
+       Rename function to avoid confusion with convert_to_utf8 in input.c.
+
 2023-11-17  Gavin Smith <gavinsmith0123@gmail.com>
 
        * tp/Texinfo/XS/main/api_to_perl.c (croak_message):
diff --git a/tp/Texinfo/XS/main/convert_utils.c 
b/tp/Texinfo/XS/main/convert_utils.c
index 80f587761a..e9863bad77 100644
--- a/tp/Texinfo/XS/main/convert_utils.c
+++ b/tp/Texinfo/XS/main/convert_utils.c
@@ -163,8 +163,8 @@ add_heading_number (OPTIONS *options, const ELEMENT 
*current, char *text,
 }
 
 static char *
-convert_to_utf8 (char *s, ENCODING_CONVERSION *conversion,
-                 const SOURCE_INFO *source_info)
+convert_to_utf8_verbatiminclude (char *s, ENCODING_CONVERSION *conversion,
+                                 const SOURCE_INFO *source_info)
 {
   char *result;
   if (!conversion)
@@ -311,7 +311,8 @@ expand_verbatiminclude (ERROR_MESSAGE_LIST *error_messages,
                   break;
                 }
 
-              text = convert_to_utf8 (line, conversion, &current->source_info);
+              text = convert_to_utf8_verbatiminclude
+                       (line, conversion, &current->source_info);
               free (line);
               raw = new_element (ET_raw);
               text_append (&raw->text, text);