[no subject]

[Patrice Dumas]

branch: master
commit 1a92787ec5d550652e34e7ec765ad78ea2796dcb
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Oct 28 14:59:57 2024 +0100

    * tp/Texinfo/XS/main/customization_options.c
    (copy_options_list_options): rename copy_numbered_options_list_options
    as copy_options_list_options.
---
 ChangeLog                                  | 6 ++++++
 tp/Texinfo/XS/convert/converter.c          | 8 ++++----
 tp/Texinfo/XS/main/customization_options.c | 6 ++----
 tp/Texinfo/XS/main/customization_options.h | 3 +--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 56a3206ebc..3bfe66d258 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-10-28  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/main/customization_options.c
+       (copy_options_list_options): rename copy_numbered_options_list_options
+       as copy_options_list_options.
+
 2024-10-28  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/get_converter_perl_info.c
diff --git a/tp/Texinfo/XS/convert/converter.c 
b/tp/Texinfo/XS/convert/converter.c
index 1142d01cff..8f51ca78ca 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -313,7 +313,7 @@ static void
 apply_converter_info (CONVERTER *converter,
               CONVERTER_INITIALIZATION_INFO *init_info, int set_configured)
 {
-  copy_numbered_options_list_options (converter->conf,
+  copy_options_list_options (converter->conf,
                              converter->sorted_options,
                              &init_info->conf, set_configured);
 
@@ -341,9 +341,9 @@ set_converter_init_information (CONVERTER *converter,
   converter->format_defaults_conf = new_options ();
   format_defaults_sorted_options
     = new_sorted_options (converter->format_defaults_conf);
-  copy_numbered_options_list_options (converter->format_defaults_conf,
-                                      format_defaults_sorted_options,
-                                      &format_defaults->conf, 0);
+  copy_options_list_options (converter->format_defaults_conf,
+                             format_defaults_sorted_options,
+                             &format_defaults->conf, 0);
   free (format_defaults_sorted_options);
 
   if (user_conf)
diff --git a/tp/Texinfo/XS/main/customization_options.c 
b/tp/Texinfo/XS/main/customization_options.c
index cc147a483d..84a19f263f 100644
--- a/tp/Texinfo/XS/main/customization_options.c
+++ b/tp/Texinfo/XS/main/customization_options.c
@@ -418,12 +418,10 @@ find_option_string (OPTION **sorted_options, const char 
*name)
 }
 
 /* copy OPTIONS_LIST options to an OPTIONS structure, using the sorted options
-   to find the struct fields.  The source options numbers need to be set
-   already.
+   to find the struct fields.
  */
 void
-copy_numbered_options_list_options (OPTIONS *options,
-                                    OPTION **sorted_options,
+copy_options_list_options (OPTIONS *options, OPTION **sorted_options,
                            OPTIONS_LIST *options_list, int set_configured)
 {
   size_t i;
diff --git a/tp/Texinfo/XS/main/customization_options.h 
b/tp/Texinfo/XS/main/customization_options.h
index 73652c4a6a..70752e7846 100644
--- a/tp/Texinfo/XS/main/customization_options.h
+++ b/tp/Texinfo/XS/main/customization_options.h
@@ -56,8 +56,7 @@ void copy_option (OPTION *destination, const OPTION *source);
 void setup_sorted_options (OPTION **sorted_options, OPTIONS *options);
 OPTION **new_sorted_options (OPTIONS *options);
 OPTION *find_option_string (OPTION **sorted_options, const char *name);
-void copy_numbered_options_list_options (OPTIONS *options,
-                                OPTION **sorted_options,
+void copy_options_list_options (OPTIONS *options, OPTION **sorted_options,
                                 OPTIONS_LIST *options_list, int 
set_configured);
 void set_sorted_option_key_configured (OPTION **sorted_options,
                                        const char *key, int configured);