branch master updated: * tp/Texinfo/XS/main/replace_perl_api_call.c (call_setup_collator): remove bug message as this function may be called if not linked against Perl and a collation locale was specified but not found.

[Patrice Dumas]

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 173e7cd6cf * tp/Texinfo/XS/main/replace_perl_api_call.c 
(call_setup_collator): remove bug message as this function may be called if not 
linked against Perl and a collation locale was specified but not found.
173e7cd6cf is described below

commit 173e7cd6cf5f02a27e4e37f94ecd7e11680c012b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Oct 6 16:23:52 2024 +0200

    * tp/Texinfo/XS/main/replace_perl_api_call.c (call_setup_collator):
    remove bug message as this function may be called if not linked
    against Perl and a collation locale was specified but not found.
    
    * tp/Texinfo/XS/main/manipulate_indices.c (setup_collator): If there
    is no collator returned by call_setup_collator, fallback to
    ctn_no_unicode.  Happens if not linked against Perl and a collation
    locale was specified but not found.  May possibly happen in other
    cases.
    
    Report from Gavin.
---
 ChangeLog                                  | 14 ++++++++++++++
 tp/Texinfo/XS/main/manipulate_indices.c    |  7 ++++++-
 tp/Texinfo/XS/main/replace_perl_api_call.c |  3 ++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e836ec99e1..c87952b556 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2024-10-06  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/main/replace_perl_api_call.c (call_setup_collator):
+       remove bug message as this function may be called if not linked
+       against Perl and a collation locale was specified but not found.
+
+       * tp/Texinfo/XS/main/manipulate_indices.c (setup_collator): If there
+       is no collator returned by call_setup_collator, fallback to
+       ctn_no_unicode.  Happens if not linked against Perl and a collation
+       locale was specified but not found.  May possibly happen in other
+       cases.
+
+       Report from Gavin.
+
 2024-10-06  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/teximakehtml.c (test_parser_EXPANDED_FORMATS_array)
diff --git a/tp/Texinfo/XS/main/manipulate_indices.c 
b/tp/Texinfo/XS/main/manipulate_indices.c
index 9e98647d0c..26f9882907 100644
--- a/tp/Texinfo/XS/main/manipulate_indices.c
+++ b/tp/Texinfo/XS/main/manipulate_indices.c
@@ -618,8 +618,13 @@ setup_collator (int use_unicode_collation, const char 
*collation_language,
       #endif
       #endif
 
-      result->type = ctn_unicode;
       result->coll.sv = call_setup_collator (1, 0);
+      if (result->coll.sv == 0)
+        /* not sure that it may happen with Perl, but if not linked against
+           Perl, this is a likely outcome */
+        result->type = ctn_no_unicode;
+      else
+        result->type = ctn_unicode;
     }
   return result;
 }
diff --git a/tp/Texinfo/XS/main/replace_perl_api_call.c 
b/tp/Texinfo/XS/main/replace_perl_api_call.c
index 291cf869f7..fa28d4371b 100644
--- a/tp/Texinfo/XS/main/replace_perl_api_call.c
+++ b/tp/Texinfo/XS/main/replace_perl_api_call.c
@@ -62,10 +62,11 @@ call_nodenamenormalization_unicode_to_transliterate (const 
char *text)
   return result;
 }
 
+/* happens if not linked against Perl and a collation locale was specified
+   but not found */
 const void *
 call_setup_collator (int use_unicode_collation, const char *locale_lang)
 {
-  fprintf (stderr, "BUG: no Perl collation\n");
   return 0;
 }