[no subject]

[Patrice Dumas]

branch: master
commit 7f61617adfa564a26a6e039637f3e109fab6e6c2
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jul 24 12:43:30 2024 +0200

    * tp/Texinfo/XS/convert/ConvertXS.xs (html_prepare_title_titlepage),
    tp/Texinfo/XS/convert/convert_html.c,
    tp/Texinfo/XS/convert/get_html_perl_info.c: remove
    html_converter_prepare_output, which does nothing.  Do not get
    jslicenses from Perl as they are setup in C.  Remove
    html_converter_prepare_output_sv, which now does nothing.
---
 ChangeLog                                  |  9 ++++++++
 tp/Texinfo/XS/convert/ConvertXS.xs         |  2 --
 tp/Texinfo/XS/convert/convert_html.c       |  7 ------
 tp/Texinfo/XS/convert/convert_html.h       |  2 --
 tp/Texinfo/XS/convert/get_html_perl_info.c | 34 ++++++------------------------
 tp/Texinfo/XS/convert/get_html_perl_info.h |  2 --
 6 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e9abea0414..22a7150e84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,15 @@
        (call_formatting_function_format_single_footnote): check and reset
        flags in build_html_formatting_state.
 
+2024-07-24  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/ConvertXS.xs (html_prepare_title_titlepage),
+       tp/Texinfo/XS/convert/convert_html.c,
+       tp/Texinfo/XS/convert/get_html_perl_info.c: remove
+       html_converter_prepare_output, which does nothing.  Do not get
+       jslicenses from Perl as they are setup in C.  Remove
+       html_converter_prepare_output_sv, which now does nothing.
+
 2024-07-24  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/get_html_perl_info.c (html_get_jslicenses_sv)
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs 
b/tp/Texinfo/XS/convert/ConvertXS.xs
index 9d9073551f..31b40e8e87 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -2303,8 +2303,6 @@ html_prepare_title_titlepage (SV *converter_in, 
output_file, output_filename, ..
          self = get_sv_converter (converter_in, 
"html_prepare_title_titlepage");
          if (self)
            {
-             html_converter_prepare_output_sv (converter_in, self);
-
              html_prepare_title_titlepage (self, output_file, output_filename);
              build_html_formatting_state (self);
            }
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index 27cde67f75..02b0c037f5 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -17576,13 +17576,6 @@ html_converter_initialize (CONVERTER *self)
     */
 }
 
-/* called in the end of html_converter_prepare_output_sv, just before
-   html_prepare_title_titlepage and just before the start of conversion */
-void
-html_converter_prepare_output (CONVERTER* self)
-{
-}
-
 void
 reset_html_targets_list (CONVERTER *self, HTML_TARGET_LIST *targets)
 {
diff --git a/tp/Texinfo/XS/convert/convert_html.h 
b/tp/Texinfo/XS/convert/convert_html.h
index 29b7223fbb..6109206034 100644
--- a/tp/Texinfo/XS/convert/convert_html.h
+++ b/tp/Texinfo/XS/convert/convert_html.h
@@ -51,8 +51,6 @@ void html_conversion_finalization (CONVERTER *self);
 int html_setup_output (CONVERTER *self, char **paths);
 void html_setup_convert (CONVERTER *self);
 
-void html_converter_prepare_output (CONVERTER* self);
-
 void initialize_cmd_list (COMMAND_ID_LIST *cmd_list, size_t size,
                           size_t number);
 
diff --git a/tp/Texinfo/XS/convert/get_html_perl_info.c 
b/tp/Texinfo/XS/convert/get_html_perl_info.c
index 03fdb6e0bb..d1b17173c8 100644
--- a/tp/Texinfo/XS/convert/get_html_perl_info.c
+++ b/tp/Texinfo/XS/convert/get_html_perl_info.c
@@ -1501,9 +1501,16 @@ html_conversion_initialization_sv (SV *converter_sv, 
CONVERTER *converter)
             }
         }
     }
+#undef FETCH
 }
 
 /* get jslicenses from Perl */
+/* currently unused, as jslicenses are setup in C.  Could be called like:
+  SV **jslicenses_sv = hv_fetch (converter_info_hv, "jslicenses",
+                                 strlen ("jslicenses"), 0);
+  if (jslicenses_sv)
+    html_get_jslicenses_sv (*jslicenses_sv, converter);
+ */
 void
 html_get_jslicenses_sv (SV *jslicenses_sv, CONVERTER *converter)
 {
@@ -1590,33 +1597,6 @@ html_get_jslicenses_sv (SV *jslicenses_sv, CONVERTER 
*converter)
     }
 }
 
-void
-html_converter_prepare_output_sv (SV *converter_sv, CONVERTER *converter)
-{
-  HV *converter_hv;
-  SV **converter_info_sv;
-
-  dTHX;
-
-  converter_hv = (HV *)SvRV (converter_sv);
-
-  FETCH(converter_info);
-
-  if (converter_info_sv)
-    {
-      HV *converter_info_hv = (HV *)SvRV (*converter_info_sv);
-      SV **jslicenses_sv = hv_fetch (converter_info_hv, "jslicenses",
-                                     strlen ("jslicenses"), 0);
-      if (jslicenses_sv)
-        {
-          html_get_jslicenses_sv (*jslicenses_sv, converter);
-        }
-    }
-  html_converter_prepare_output (converter);
-}
-
-#undef FETCH
-
 #define FETCH(key) key##_sv = hv_fetch (element_hv, #key, strlen (#key), 0);
 
 /* find C Texinfo tree element based on element_sv perl tree element.
diff --git a/tp/Texinfo/XS/convert/get_html_perl_info.h 
b/tp/Texinfo/XS/convert/get_html_perl_info.h
index d1a5ecd254..2de258f34f 100644
--- a/tp/Texinfo/XS/convert/get_html_perl_info.h
+++ b/tp/Texinfo/XS/convert/get_html_perl_info.h
@@ -27,8 +27,6 @@ void html_converter_initialize_sv (SV *converter_sv,
 void html_conversion_initialization_sv (SV *converter_sv,
                                         CONVERTER *converter);
 
-void html_converter_prepare_output_sv (SV *converter_sv, CONVERTER *converter);
-
 const ELEMENT *html_find_element_from_sv (CONVERTER *converter,
                                     const SV *element_sv,
                                     int output_units_descriptor);