[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Mon, 28 Oct 2024 09:27:38 -0400 (EDT) |
branch: master
commit 1137313bd84d7d3ad7687be319bafcf7675d848c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Oct 28 14:27:25 2024 +0100
* tp/Texinfo/XS/convert/get_converter_perl_info.c
(get_converter_info_from_sv): remove unused sorted_options argument.
Update callers.
---
ChangeLog | 6 ++++++
tp/Texinfo/XS/convert/ConvertXS.xs | 10 ++++------
tp/Texinfo/XS/convert/get_converter_perl_info.c | 3 +--
tp/Texinfo/XS/convert/get_converter_perl_info.h | 3 +--
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 011e3af277..6de5f87298 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-10-28 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/convert/get_converter_perl_info.c
+ (get_converter_info_from_sv): remove unused sorted_options argument.
+ Update callers.
+
2024-10-28 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/convert/texinfo.c (err_add_option_value): remove
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs
b/tp/Texinfo/XS/convert/ConvertXS.xs
index 0f5453b1cc..a163be60b0 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -140,8 +140,7 @@ converter_defaults (SV *converter_in, SV *conf_sv)
Do not pass class_name to avoid error messages, there will
be an error messages in generic_converter_init (as in Perl)
*/
- conf = get_converter_info_from_sv (conf_sv, 0, 0,
- txi_base_sorted_options);
+ conf = get_converter_info_from_sv (conf_sv, 0, 0);
format_defaults = converter_defaults (converter_format, conf);
@@ -166,7 +165,7 @@ converter_defaults (SV *converter_in, SV *conf_sv)
}
else
{
- /* return format_defaults built to Perl */
+ /* no converter, return format_defaults built to Perl for the class */
RETVAL
= build_sv_options_from_options_list (&format_defaults->conf, 0);
destroy_converter_initialization_info (format_defaults);
@@ -192,7 +191,7 @@ generic_converter_init (SV *converter_in, SV
*format_defaults_sv, SV *conf_sv=0)
self->hv = converter_hv;
format_defaults = get_converter_info_from_sv (format_defaults_sv,
- class_name, self, self->sorted_options);
+ class_name, self);
/* if format_defaults_sv is undef, it should mean that format_defaults
has been registered in the C converter */
if (!format_defaults)
@@ -201,8 +200,7 @@ generic_converter_init (SV *converter_in, SV
*format_defaults_sv, SV *conf_sv=0)
self->format_defaults = 0;
}
- conf = get_converter_info_from_sv (conf_sv, class_name, self,
- self->sorted_options);
+ conf = get_converter_info_from_sv (conf_sv, class_name, self);
set_converter_init_information (self, format_defaults, conf);
diff --git a/tp/Texinfo/XS/convert/get_converter_perl_info.c
b/tp/Texinfo/XS/convert/get_converter_perl_info.c
index c2a052c77f..66730cc922 100644
--- a/tp/Texinfo/XS/convert/get_converter_perl_info.c
+++ b/tp/Texinfo/XS/convert/get_converter_perl_info.c
@@ -233,8 +233,7 @@ new_numbered_option_from_sv (SV *option_sv, CONVERTER
*converter,
CONVERTER may be NULL (when called from converter_defaults). */
CONVERTER_INITIALIZATION_INFO *
get_converter_info_from_sv (SV *conf_sv, const char *class_name,
- CONVERTER *converter,
- OPTION **sorted_options)
+ CONVERTER *converter)
{
CONVERTER_INITIALIZATION_INFO *initialization_info = 0;
diff --git a/tp/Texinfo/XS/convert/get_converter_perl_info.h
b/tp/Texinfo/XS/convert/get_converter_perl_info.h
index d7bd5429e4..2642f839f0 100644
--- a/tp/Texinfo/XS/convert/get_converter_perl_info.h
+++ b/tp/Texinfo/XS/convert/get_converter_perl_info.h
@@ -14,8 +14,7 @@ CONVERTER *get_sv_converter (SV *sv_in, const char
*warn_string);
CONVERTER *get_or_create_sv_converter (SV *converter_in,
const char *input_class);
CONVERTER_INITIALIZATION_INFO * get_converter_info_from_sv (SV *conf_sv,
- const char *class, CONVERTER *converter,
- OPTION **sorted_options);
+ const char *class, CONVERTER *converter);
void set_non_customization_sv (HV *converter_hv, SV *init_info_sv,
STRING_LIST *non_valid_customization);
CONVERTER *converter_set_document_from_sv (SV *converter_in, SV *document_in);