branch master updated: * tp/Texinfo/Convert/HTML.pm (_XS_reset_output_init_conf), tp/Texinfo/XS/convert/ConvertXS.xs (reset_output_init_conf), tp/Texinfo/XS/main/get_perl_info.c (reset_output_init_conf): remove warn_string argument of reset_output_init_conf, always use one.

[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 add5d478e5 * tp/Texinfo/Convert/HTML.pm (_XS_reset_output_init_conf), 
tp/Texinfo/XS/convert/ConvertXS.xs (reset_output_init_conf), 
tp/Texinfo/XS/main/get_perl_info.c (reset_output_init_conf): remove warn_string 
argument of reset_output_init_conf, always use one.
add5d478e5 is described below

commit add5d478e59bb4150d7ac0fef1c8ea0253ba45e4
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Jan 4 12:14:17 2024 +0100

    * tp/Texinfo/Convert/HTML.pm (_XS_reset_output_init_conf),
    tp/Texinfo/XS/convert/ConvertXS.xs (reset_output_init_conf),
    tp/Texinfo/XS/main/get_perl_info.c (reset_output_init_conf): remove
    warn_string argument of reset_output_init_conf, always use one.
---
 ChangeLog                          |  9 ++++++++-
 tp/Texinfo/Convert/HTML.pm         |  6 +++---
 tp/Texinfo/XS/convert/ConvertXS.xs |  3 +--
 tp/Texinfo/XS/main/get_perl_info.c | 16 +++++++++-------
 tp/Texinfo/XS/main/get_perl_info.h |  2 +-
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 967fbac38d..acd644628c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-01-04  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (_XS_reset_output_init_conf),
+       tp/Texinfo/XS/convert/ConvertXS.xs (reset_output_init_conf),
+       tp/Texinfo/XS/main/get_perl_info.c (reset_output_init_conf): remove
+       warn_string argument of reset_output_init_conf, always use one.
+
 2024-01-04  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (_XS_reset_output_init_conf): define for
@@ -8,7 +15,7 @@
 
        * tp/Texinfo/XS/convert/ConvertXS.xs
        (html_prepare_converted_output_info): do not copy configuration from
-       perl, it should be already set in XS through the overrided functions.
+       perl, it should be already set in XS through the overriden functions.
 
        * tp/Texinfo/XS/main/get_perl_info.c (init_copy_sv_options)
        (copy_converter_conf_sv): rename copy_sv_options as
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 02eb21464b..7ed394c328 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -276,7 +276,7 @@ my %XS_conversion_overrides = (
   # => "Texinfo::Convert::ConvertXS::html_convert_tree",
 );
 
-# XS function does initialization independent of customization
+# XS initialization independent of customization
 sub _XS_format_init()
 {
 }
@@ -12205,7 +12205,7 @@ sub _html_convert_output($$$$$$$$)
   return $text_output;
 }
 
-sub _XS_reset_output_init_conf($$)
+sub _XS_reset_output_init_conf($)
 {
 }
 
@@ -12297,7 +12297,7 @@ sub output($$)
   # configuration.
   $self->{'output_init_conf'} = { %{$self->{'conf'}} };
   # pass to XS.
-  _XS_reset_output_init_conf($self, 'reset_output_init_conf');
+  _XS_reset_output_init_conf($self);
 
   # set BODYTEXT
   $self->set_global_document_commands('preamble', ['documentlanguage']);
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs 
b/tp/Texinfo/XS/convert/ConvertXS.xs
index 973f4fa58a..3adbbf25c3 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -1616,8 +1616,7 @@ html_merge_index_entries (SV *converter_in)
            html_merge_index_entries (self);
 
 void
-reset_output_init_conf (SV *sv_in, warn_string)
-         char *warn_string = (char *)SvPVutf8_nolen($arg);
+reset_output_init_conf (SV *sv_in)
 
 #  my ($output_units, $special_units, $associated_special_units)
 #    = $self->_prepare_conversion_units($root, $document_name);
diff --git a/tp/Texinfo/XS/main/get_perl_info.c 
b/tp/Texinfo/XS/main/get_perl_info.c
index b5859d3203..f49f87fd63 100644
--- a/tp/Texinfo/XS/main/get_perl_info.c
+++ b/tp/Texinfo/XS/main/get_perl_info.c
@@ -555,19 +555,21 @@ converter_initialize (SV *converter_sv)
 }
 
 void
-reset_output_init_conf (SV *sv_in, const char *warn_string)
+reset_output_init_conf (SV *sv_in)
 {
-  HV *hv_in;
-  CONVERTER *converter = 0;
+  CONVERTER *converter;
 
   dTHX;
 
-  converter = get_sv_converter (sv_in, warn_string);
+  converter = get_sv_converter (sv_in, "reset_output_init_conf");
 
-  hv_in = (HV *)SvRV (sv_in);
+  if (converter)
+    {
+      HV *hv_in = (HV *)SvRV (sv_in);
 
-  copy_converter_conf_sv (hv_in, converter, &converter->init_conf,
-                          "output_init_conf", 1);
+      copy_converter_conf_sv (hv_in, converter, &converter->init_conf,
+                             "output_init_conf", 1);
+    }
 }
 
 /* code in comments allow to sort the index names to have a fixed order
diff --git a/tp/Texinfo/XS/main/get_perl_info.h 
b/tp/Texinfo/XS/main/get_perl_info.h
index 2844d8644c..31a38bc891 100644
--- a/tp/Texinfo/XS/main/get_perl_info.h
+++ b/tp/Texinfo/XS/main/get_perl_info.h
@@ -40,7 +40,7 @@ void force_conf (CONVERTER *converter, const char *conf, SV 
*value);
 
 CONVERTER *get_sv_converter (SV *sv_in, const char *warn_string);
 int converter_initialize (SV *converter_sv);
-void reset_output_init_conf (SV *sv_in, const char *warn_string);
+void reset_output_init_conf (SV *sv_in);
 
 INDEX_SORTED_BY_LETTER *get_sv_index_entries_sorted_by_letter
                  (INDEX **index_names, SV *index_entries_sorted_by_letter);