branch master updated: * tp/Texinfo/XS/main/manipulate_indices.c (INDEX_COLLATOR, setup_collator, destroy_indices_sortable_entries): remove INDEX_COLLATOR language field.

[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 3d36d526ad * tp/Texinfo/XS/main/manipulate_indices.c (INDEX_COLLATOR, 
setup_collator, destroy_indices_sortable_entries): remove INDEX_COLLATOR 
language field.
3d36d526ad is described below

commit 3d36d526adb5a508f02a21c801bd72efeab33b5a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Feb 23 16:46:16 2024 +0100

    * tp/Texinfo/XS/main/manipulate_indices.c
    (INDEX_COLLATOR, setup_collator, destroy_indices_sortable_entries):
    remove INDEX_COLLATOR language field.
---
 ChangeLog                               | 6 ++++++
 tp/Texinfo/XS/main/manipulate_indices.c | 9 ---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7c748ac8d9..1a7878cc15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-02-23  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/main/manipulate_indices.c
+       (INDEX_COLLATOR, setup_collator, destroy_indices_sortable_entries):
+       remove INDEX_COLLATOR language field.
+
 2024-02-23  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/main/errors.c  (message_list_document_error)
diff --git a/tp/Texinfo/XS/main/manipulate_indices.c 
b/tp/Texinfo/XS/main/manipulate_indices.c
index f12d884dee..9af6ad1546 100644
--- a/tp/Texinfo/XS/main/manipulate_indices.c
+++ b/tp/Texinfo/XS/main/manipulate_indices.c
@@ -272,7 +272,6 @@ index_entry_element_sort_string (const INDEX_ENTRY 
*main_entry,
 
 typedef struct INDEX_COLLATOR {
     enum collation_type_name type;
-    char *language;
     union {
       /* perl element. This should be SV *sv,
          but we don't want to include the Perl headers everywhere; */
@@ -581,13 +580,10 @@ setup_collator (int use_unicode_collation, const char 
*collation_language,
   if (use_unicode_collation == 0)
     {
       result->type = ctn_no_unicode;
-      /* TODO check if needed */
-      result->language = strdup ("");
     }
   else if (collation_language)
     {
       result->type = ctn_language_collation;
-      result->language = strdup (collation_language);
       result->sv = call_setup_collator (1, collation_language);
     }
   else
@@ -601,7 +597,6 @@ setup_collator (int use_unicode_collation, const char 
*collation_language,
           if (result->locale)
             {
               result->type = ctn_locale_collation;
-              result->language = strdup (collation_locale);
               return result;
             }
           else
@@ -614,8 +609,6 @@ setup_collator (int use_unicode_collation, const char 
*collation_language,
       #endif
 
       result->type = ctn_unicode;
-      /* TODO check if needed */
-      result->language = strdup ("-");
       result->sv = call_setup_collator (1, 0);
     }
   return result;
@@ -892,8 +885,6 @@ destroy_indices_sortable_entries (
 static void
 destroy_collator (INDEX_COLLATOR *collator)
 {
-  if (collator)
-    free (collator->language);
   free (collator);
 }