[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/XS/convert/ConvertXS.xs (html_prepar
From: |
Patrice Dumas |
Subject: |
branch master updated: * tp/Texinfo/XS/convert/ConvertXS.xs (html_prepare_conversion_units) (html_prepare_units_directions_files, html_translate_names) (html_prepare_output_units_global_targets): set warning strings. |
Date: |
Mon, 06 Nov 2023 09:07:46 -0500 |
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 e7269e7ac0 * tp/Texinfo/XS/convert/ConvertXS.xs
(html_prepare_conversion_units) (html_prepare_units_directions_files,
html_translate_names) (html_prepare_output_units_global_targets): set warning
strings.
e7269e7ac0 is described below
commit e7269e7ac0b3ba23cc514ac56644384ec5b05af6
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Nov 6 15:07:38 2023 +0100
* tp/Texinfo/XS/convert/ConvertXS.xs (html_prepare_conversion_units)
(html_prepare_units_directions_files, html_translate_names)
(html_prepare_output_units_global_targets): set warning strings.
* tp/Texinfo/XS/main/build_perl_info.c (pass_output_unit_files):
increase ref count of references stored in converter.
---
ChangeLog | 9 +++++++++
tp/Texinfo/XS/convert/ConvertXS.xs | 21 ++++++++++-----------
tp/Texinfo/XS/main/build_perl_info.c | 4 +++-
3 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0e1d526bcb..2b7393ff86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2023-11-06 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/convert/ConvertXS.xs (html_prepare_conversion_units)
+ (html_prepare_units_directions_files, html_translate_names)
+ (html_prepare_output_units_global_targets): set warning strings.
+
+ * tp/Texinfo/XS/main/build_perl_info.c (pass_output_unit_files):
+ increase ref count of references stored in converter.
+
2023-11-06 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (_prepare_units_directions_files)
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs
b/tp/Texinfo/XS/convert/ConvertXS.xs
index 4a60c8ed46..f2b2e8e5ff 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -240,8 +240,8 @@ html_prepare_conversion_units (SV *converter_in, ...)
if (items > 1 && SvOK(ST(1)))
document_name = SvPVutf8_nolen (ST(1));
- /* add warn string? */
- self = set_output_converter_sv (converter_in, 0);
+ self = set_output_converter_sv (converter_in,
+ "html_prepare_conversion_units");
html_prepare_conversion_units (self,
&output_units_descriptor, &special_units_descriptor,
&associated_special_units_descriptor);
@@ -287,8 +287,8 @@ html_prepare_units_directions_files (SV *converter_in, SV
*output_units_in, SV *
FILE_SOURCE_INFO_LIST *files_source_info = 0;
SV *files_source_info_sv;
CODE:
- /* add warn string? */
- self = get_sv_converter (converter_in, 0);
+ self = get_sv_converter (converter_in,
+ "html_prepare_units_directions_files");
if (SvOK (output_units_in))
output_units_descriptor
= get_sv_output_units_descriptor (output_units_in,
@@ -335,8 +335,8 @@ html_prepare_output_units_global_targets (SV *converter_in,
SV *output_units_in,
int special_units_descriptor = 0;
int associated_special_units_descriptor = 0;
CODE:
- /* add warn string? */
- self = get_sv_converter (converter_in, 0);
+ self = get_sv_converter (converter_in,
+ "html_prepare_output_units_global_targets");
if (SvOK (output_units_in))
output_units_descriptor
= get_sv_output_units_descriptor (output_units_in,
@@ -371,7 +371,7 @@ html_translate_names (SV *converter_in)
HV *hv_in;
SV **converter_options_sv;
CODE:
- self = get_sv_converter (converter_in, 0);
+ self = get_sv_converter (converter_in, "html_translate_names");
/* that kind of code could be in get_perl_info too */
hv_in = (HV *)SvRV (converter_in);
converter_options_sv = hv_fetch (hv_in, "conf",
@@ -404,8 +404,7 @@ html_prepare_title_titlepage (SV *converter_in, SV
*output_units_in, output_file
CONVERTER *self = 0;
int output_units_descriptor = 0;
CODE:
- /* TODO error? */
- self = get_sv_converter (converter_in, 0);
+ self = get_sv_converter (converter_in,
"html_prepare_title_titlepage");
if (SvOK (output_units_in))
output_units_descriptor
= get_sv_output_units_descriptor (output_units_in,
@@ -508,8 +507,8 @@ html_convert_output (SV *converter_in, SV *tree_in, SV
*output_units_in, SV *spe
SV *result_sv = 0;
CODE:
/* add warn string? */
- self = get_sv_converter (converter_in, 0);
- document = get_sv_tree_document (tree_in, 0);
+ self = get_sv_converter (converter_in, "html_convert_output");
+ document = get_sv_tree_document (tree_in, "html_convert_output");
if (SvOK (output_units_in))
output_units_descriptor
= get_sv_output_units_descriptor (output_units_in,
diff --git a/tp/Texinfo/XS/main/build_perl_info.c
b/tp/Texinfo/XS/main/build_perl_info.c
index ba84769c08..5fef2b93f4 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -1954,7 +1954,9 @@ pass_output_unit_files (SV *converter_sv,
file_counters_sv = build_file_counters (output_unit_files);
out_filepaths_sv = build_out_filepaths (output_unit_files);
-#define STORE(key) hv_store (converter_hv, #key, strlen (#key), key##_sv, 0)
+#define STORE(key) \
+ hv_store (converter_hv, #key, strlen (#key), key##_sv, 0); \
+ SvREFCNT_inc (key##_sv);
STORE(filenames);
STORE (file_counters);
STORE (out_filepaths);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/XS/convert/ConvertXS.xs (html_prepare_conversion_units) (html_prepare_units_directions_files, html_translate_names) (html_prepare_output_units_global_targets): set warning strings.,
Patrice Dumas <=
- Prev by Date:
master updated (7467fde7bc -> 1b12deb06f)
- Next by Date:
branch master updated: * tp/Texinfo/Convert/HTML.pm (import, _translate_names) (_prepare_conversion_units, _prepare_units_directions_files) (_prepare_title_titlepage, _html_convert_convert, convert) (_html_convert_output), tp/Texinfo/XS/convert/ConvertXS.xs (html_prepare_conversion_units): override directly perl functions. Add _html_convert_convert based on convert code to override conversion. Change html_prepare_conversion_units to match perl function call.
- Previous by thread:
master updated (7467fde7bc -> 1b12deb06f)
- Next by thread:
branch master updated: * tp/Texinfo/Convert/HTML.pm (import, _translate_names) (_prepare_conversion_units, _prepare_units_directions_files) (_prepare_title_titlepage, _html_convert_convert, convert) (_html_convert_output), tp/Texinfo/XS/convert/ConvertXS.xs (html_prepare_conversion_units): override directly perl functions. Add _html_convert_convert based on convert code to override conversion. Change html_prepare_conversion_units to match perl function call.
- Index(es):