branch master updated: * tp/Texinfo/XS/convert/converter.c (destroy_converter_initialization_info), tp/Texinfo/XS/convert/texinfo.c (txi_converter_format_defaults), tp/Texinfo/XS/main/converter_types.h (CONVERTER_INITIALIZATION_INFO): remove the options field in CONVERTER_INITIALIZATION_INFO as it is now always set in conf.

[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 6f4794dde6 * tp/Texinfo/XS/convert/converter.c 
(destroy_converter_initialization_info), tp/Texinfo/XS/convert/texinfo.c 
(txi_converter_format_defaults), tp/Texinfo/XS/main/converter_types.h 
(CONVERTER_INITIALIZATION_INFO): remove the options field in 
CONVERTER_INITIALIZATION_INFO as it is now always set in conf.
6f4794dde6 is described below

commit 6f4794dde61f39de3b649d0aea8c1559bb7988cc
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Oct 28 09:25:42 2024 +0100

    * tp/Texinfo/XS/convert/converter.c
    (destroy_converter_initialization_info),
    tp/Texinfo/XS/convert/texinfo.c (txi_converter_format_defaults),
    tp/Texinfo/XS/main/converter_types.h (CONVERTER_INITIALIZATION_INFO):
    remove the options field in CONVERTER_INITIALIZATION_INFO as it is now
    always set in conf.
---
 ChangeLog                            |  9 +++++++++
 tp/Texinfo/XS/convert/converter.c    |  6 ------
 tp/Texinfo/XS/convert/texinfo.c      | 14 +-------------
 tp/Texinfo/XS/main/converter_types.h |  3 ---
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 80d55a3ce5..a088ab3812 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-10-28  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/converter.c
+       (destroy_converter_initialization_info),
+       tp/Texinfo/XS/convert/texinfo.c (txi_converter_format_defaults),
+       tp/Texinfo/XS/main/converter_types.h (CONVERTER_INITIALIZATION_INFO):
+       remove the options field in CONVERTER_INITIALIZATION_INFO as it is now
+       always set in conf.
+
 2024-10-28  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/main/customization_options.c
diff --git a/tp/Texinfo/XS/convert/converter.c 
b/tp/Texinfo/XS/convert/converter.c
index 3a92dcdbac..39b095b178 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -383,12 +383,6 @@ destroy_converter_initialization_info 
(CONVERTER_INITIALIZATION_INFO *init_info)
   if (init_info->translated_commands)
     destroy_translated_commands (init_info->translated_commands);
 
-  if (init_info->options)
-    {
-      free_options (init_info->options);
-      free (init_info->options);
-    }
-
   free_options_list (&init_info->conf);
 
   free_strings_list (&init_info->non_valid_customization);
diff --git a/tp/Texinfo/XS/convert/texinfo.c b/tp/Texinfo/XS/convert/texinfo.c
index 68d07b2648..fd152a3e13 100644
--- a/tp/Texinfo/XS/convert/texinfo.c
+++ b/tp/Texinfo/XS/convert/texinfo.c
@@ -85,26 +85,14 @@ txi_converter_format_defaults (const char *format_str,
     = find_format_name_converter_format (format_str);
   CONVERTER_INITIALIZATION_INFO *conf = new_converter_initialization_info ();
   CONVERTER_INITIALIZATION_INFO *format_defaults;
-  OPTION **format_defaults_sorted_options;
 
   if (customizations)
-    {
-      copy_options_list (&conf->conf, customizations);
-    }
+    copy_options_list (&conf->conf, customizations);
 
   format_defaults = converter_defaults (converter_format, conf);
 
   destroy_converter_initialization_info (conf);
 
-  /* also set options structure for a direct access */
-  format_defaults->options = new_options ();
-  format_defaults_sorted_options
-    = new_sorted_options (format_defaults->options);
-  copy_numbered_options_list_options (format_defaults->options,
-                                      format_defaults_sorted_options,
-                                      &format_defaults->conf, 0);
-  free (format_defaults_sorted_options);
-
   return format_defaults;
 }
 
diff --git a/tp/Texinfo/XS/main/converter_types.h 
b/tp/Texinfo/XS/main/converter_types.h
index 51bfee8da5..6aca42ed1b 100644
--- a/tp/Texinfo/XS/main/converter_types.h
+++ b/tp/Texinfo/XS/main/converter_types.h
@@ -756,9 +756,6 @@ typedef struct CONVERTER_INITIALIZATION_INFO {
     OPTIONS_LIST conf;
     /* gather strings that are not customization options */
     STRING_LIST non_valid_customization;
-  /* can be used for direct access to OPTIONS structure if needed, but
-     should be NULL in many cases */
-    OPTIONS *options;
 } CONVERTER_INITIALIZATION_INFO;
 
 typedef struct CONVERTER {