branch master updated: * tp/Texinfo/XS/main/get_perl_info.c (get_sv_options): inline get_sorted_options_key_sv_option in get_sv_options. Remove get_sorted_options_key_sv_option.

[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 b460955f5e * tp/Texinfo/XS/main/get_perl_info.c (get_sv_options): 
inline get_sorted_options_key_sv_option in get_sv_options.  Remove 
get_sorted_options_key_sv_option.
b460955f5e is described below

commit b460955f5e9f4eb9628b38f06b3f821fb9fae855
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Aug 24 21:36:28 2024 +0200

    * tp/Texinfo/XS/main/get_perl_info.c (get_sv_options): inline
    get_sorted_options_key_sv_option in get_sv_options.  Remove
    get_sorted_options_key_sv_option.
    
    * tp/Texinfo/XS/main/get_perl_info.c: remove get_sv_configured_options.
---
 ChangeLog                                  |  8 ++++++++
 tp/Texinfo/XS/main/customization_options.c |  1 +
 tp/Texinfo/XS/main/get_perl_info.c         | 24 ++++--------------------
 tp/Texinfo/XS/main/get_perl_info.h         |  6 ------
 4 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 888122b0ab..5bdcf348fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-08-24  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/main/get_perl_info.c (get_sv_options): inline
+       get_sorted_options_key_sv_option in get_sv_options.  Remove
+       get_sorted_options_key_sv_option.
+
+       * tp/Texinfo/XS/main/get_perl_info.c: remove get_sv_configured_options.
+
 2024-08-24  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/Converter.pm (%XS_overrides, get_conf, set_conf):
diff --git a/tp/Texinfo/XS/main/customization_options.c 
b/tp/Texinfo/XS/main/customization_options.c
index e3fe0bdee8..6872def930 100644
--- a/tp/Texinfo/XS/main/customization_options.c
+++ b/tp/Texinfo/XS/main/customization_options.c
@@ -449,6 +449,7 @@ copy_numbered_options_list_options (OPTIONS *options,
     }
 }
 
+/* Unused */
 void
 set_sorted_option_key_configured (OPTION **sorted_options, const char *key,
                                   int configured)
diff --git a/tp/Texinfo/XS/main/get_perl_info.c 
b/tp/Texinfo/XS/main/get_perl_info.c
index f946a00e01..3c8ec063f8 100644
--- a/tp/Texinfo/XS/main/get_perl_info.c
+++ b/tp/Texinfo/XS/main/get_perl_info.c
@@ -509,24 +509,7 @@ get_sv_option (OPTION *option, SV *value, int force,
   return 0;
 }
 
-
-/* return values:
-  0: success
-  -1: already set (only if !force)
-  -2: unknown
-  -3: type error
- */
-int get_sorted_options_key_sv_option (OPTIONS *options, OPTION 
**sorted_options,
-                                      const char *key, SV *value,
-                                      int force, const CONVERTER *converter)
-{
-  OPTION *option = find_option_string (sorted_options, key);
-  if (option)
-    return get_sv_option (option, value, force, options, converter);
-  return -2;
-}
-
-void
+static void
 get_sv_options (SV *sv, OPTIONS *options, OPTION **sorted_options,
                 CONVERTER *converter, int force)
 {
@@ -544,9 +527,10 @@ get_sv_options (SV *sv, OPTIONS *options, OPTION 
**sorted_options,
       char *key;
       I32 retlen;
       SV *value = hv_iternextsv (hv, &key, &retlen);
+      OPTION *option = find_option_string (sorted_options, key);
 
-      get_sorted_options_key_sv_option (options, sorted_options, key,
-                                        value, force, converter);
+      if (option)
+        get_sv_option (option, value, force, options, converter);
     }
 }
 
diff --git a/tp/Texinfo/XS/main/get_perl_info.h 
b/tp/Texinfo/XS/main/get_perl_info.h
index c863665467..4d243c7fff 100644
--- a/tp/Texinfo/XS/main/get_perl_info.h
+++ b/tp/Texinfo/XS/main/get_perl_info.h
@@ -22,12 +22,6 @@ extern const char *html_button_function_type_string[];
 int get_sv_option (OPTION *option, SV *value, int force,
                    OPTIONS *options, const CONVERTER *converter);
 
-void get_sv_options (SV *sv, OPTIONS *options, OPTION **sorted_options,
-                     CONVERTER *converter, int force);
-int get_sorted_options_key_sv_option (OPTIONS *options, OPTION 
**sorted_options,
-                                      const char *key, SV *value,
-                                      int force, const CONVERTER *converter);
-
 DOCUMENT *get_sv_tree_document (SV *tree_in, char *warn_string);
 DOCUMENT *get_sv_document_document (SV *document_in, char *warn_string);