[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Sat, 16 Nov 2024 11:19:18 -0500 (EST) |
branch: master
commit 2b60474f376e80f9cdde891431589813b5d866db
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Nov 16 17:19:11 2024 +0100
* tp/Texinfo/XS/convert/ConvertXS.xs
(converter_set_global_document_commands),
tp/Texinfo/XS/convert/get_html_perl_info.c
(html_converter_get_customization_sv, html_get_jslicenses_sv),
tp/Texinfo/XS/main/get_perl_info.c (get_sv_output_units_descriptor)
(add_svav_to_string_list, get_sv_index_entries_sorted_by_letter)
(html_get_button_specification_list),
tp/Texinfo/XS/parsetexi/Parsetexi.xs
(parser_store_INCLUDE_DIRECTORIES, parser_store_EXPANDED_FORMATS):
replace av_top_index by AvFILL, which is more portable for older Perl
versions.
---
ChangeLog | 14 ++++++++++++++
tp/Texinfo/XS/convert/ConvertXS.xs | 2 +-
tp/Texinfo/XS/convert/get_html_perl_info.c | 6 +++---
tp/Texinfo/XS/main/get_perl_info.c | 10 +++++-----
tp/Texinfo/XS/parsetexi/Parsetexi.xs | 4 ++--
5 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6d77272e34..0b77093d16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2024-11-16 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/convert/ConvertXS.xs
+ (converter_set_global_document_commands),
+ tp/Texinfo/XS/convert/get_html_perl_info.c
+ (html_converter_get_customization_sv, html_get_jslicenses_sv),
+ tp/Texinfo/XS/main/get_perl_info.c (get_sv_output_units_descriptor)
+ (add_svav_to_string_list, get_sv_index_entries_sorted_by_letter)
+ (html_get_button_specification_list),
+ tp/Texinfo/XS/parsetexi/Parsetexi.xs
+ (parser_store_INCLUDE_DIRECTORIES, parser_store_EXPANDED_FORMATS):
+ replace av_top_index by AvFILL, which is more portable for older Perl
+ versions.
+
2024-11-16 Patrice Dumas <pertusus@free.fr>
* README-hacking: update list of files with Perl C code.
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs
b/tp/Texinfo/XS/convert/ConvertXS.xs
index 460966400f..08d3c0247f 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -423,7 +423,7 @@ converter_set_global_document_commands (SV *converter_in,
char *commands_locatio
int command_location = -1;
int i;
AV *selected_commands_av = (AV *) SvRV (selected_commands);
- SSize_t in_commands_nr = av_top_index (selected_commands_av) +1;
+ SSize_t in_commands_nr = AvFILL (selected_commands_av) +1;
enum command_id *cmd_list = (enum command_id *) malloc
((in_commands_nr+1) * sizeof (enum command_id));
/* actual command index/number without unknown commands */
diff --git a/tp/Texinfo/XS/convert/get_html_perl_info.c
b/tp/Texinfo/XS/convert/get_html_perl_info.c
index 6a1b0de7f5..55d1976cb4 100644
--- a/tp/Texinfo/XS/convert/get_html_perl_info.c
+++ b/tp/Texinfo/XS/convert/get_html_perl_info.c
@@ -1217,7 +1217,7 @@ html_converter_get_customization_sv (SV *converter_sv,
AV *stage_av = (AV *)SvRV (stage_sv);
HTML_STAGE_HANDLER_INFO_LIST *stage_handler_list
= &converter->html_stage_handlers[stage];
- SSize_t stage_handlers_info_nr = av_top_index (stage_av) +1;
+ SSize_t stage_handlers_info_nr = AvFILL (stage_av) +1;
if (stage_handlers_info_nr == 0)
continue;
@@ -1240,7 +1240,7 @@ html_converter_get_customization_sv (SV *converter_sv,
SV **handler_sv;
SV **priority_sv;
- SSize_t stage_info_nr = av_top_index (stage_info_av) +1;
+ SSize_t stage_info_nr = AvFILL (stage_info_av) +1;
if (stage_info_nr != 2)
{
fprintf (stderr,
@@ -1539,7 +1539,7 @@ html_get_jslicenses_sv (SV *jslicenses_sv, CONVERTER
*converter)
= &jslicences_files_info->list[j];
jslicense_file_info->filename = non_perl_strdup (filename);
- file_info_nr = av_top_index (file_info_av) +1;
+ file_info_nr = AvFILL (file_info_av) +1;
if (file_info_nr != 3)
{
fprintf (stderr,
diff --git a/tp/Texinfo/XS/main/get_perl_info.c
b/tp/Texinfo/XS/main/get_perl_info.c
index b33098dd47..cae30ed5c3 100644
--- a/tp/Texinfo/XS/main/get_perl_info.c
+++ b/tp/Texinfo/XS/main/get_perl_info.c
@@ -188,7 +188,7 @@ get_sv_output_units_descriptor (SV *output_units_in, char
*warn_string,
}
av_in = (AV *)SvRV (output_units_in);
- output_units_nr = av_top_index (av_in) +1;
+ output_units_nr = AvFILL (av_in) +1;
if (output_units_nr > 0)
{
@@ -327,7 +327,7 @@ add_svav_to_string_list (const SV *sv, STRING_LIST
*string_list,
return;
AV *av = (AV *)SvRV (sv);
- strings_nr = av_top_index (av) +1;
+ strings_nr = AvFILL (av) +1;
for (i = 0; i < strings_nr; i++)
{
SV **string_sv = av_fetch (av, i, 0);
@@ -715,7 +715,7 @@ get_sv_index_entries_sorted_by_letter (INDEX_LIST
*indices_info,
fatal (msg);
}
av = (AV *)SvRV (sorted_by_letter_sv);
- letter_entries_nr = av_top_index (av) +1;
+ letter_entries_nr = AvFILL (av) +1;
index_index_letters = &indices_entries_by_letter[j];
index_index_letters->name = non_perl_strdup (idx_name);
@@ -752,7 +752,7 @@ get_sv_index_entries_sorted_by_letter (INDEX_LIST
*indices_info,
letter_entries->letter = non_perl_strdup (letter_string);
entries_av = (AV *) SvRV (*entries_sv);
- entries_nr = av_top_index (entries_av) +1;
+ entries_nr = AvFILL (entries_av) +1;
letter_entries->entries_number = entries_nr;
letter_entries->entries =
(INDEX_ENTRY **) malloc (entries_nr * sizeof (INDEX_ENTRY *));
@@ -891,7 +891,7 @@ html_get_button_specification_list (const CONVERTER
*converter,
buttons_av = (AV *)SvRV (buttons_sv);
- buttons_nr = av_top_index (buttons_av) +1;
+ buttons_nr = AvFILL (buttons_av) +1;
if (buttons_nr == 0)
return 0;
diff --git a/tp/Texinfo/XS/parsetexi/Parsetexi.xs
b/tp/Texinfo/XS/parsetexi/Parsetexi.xs
index 5ed0b6bd0d..d170bf5716 100644
--- a/tp/Texinfo/XS/parsetexi/Parsetexi.xs
+++ b/tp/Texinfo/XS/parsetexi/Parsetexi.xs
@@ -221,7 +221,7 @@ parser_store_INCLUDE_DIRECTORIES (SV *directories)
{
SSize_t i;
AV *directories_av = (AV *)SvRV (directories);
- SSize_t directories_nr = av_top_index (directories_av) +1;
+ SSize_t directories_nr = AvFILL (directories_av) +1;
for (i = 0; i < directories_nr; i++)
{
@@ -245,7 +245,7 @@ parser_store_EXPANDED_FORMATS (SV *expanded_formats)
{
SSize_t i;
AV *expanded_formats_av = (AV *)SvRV (expanded_formats);
- SSize_t expanded_formats_nr = av_top_index (expanded_formats_av)
+1;
+ SSize_t expanded_formats_nr = AvFILL (expanded_formats_av) +1;
for (i = 0; i < expanded_formats_nr; i++)
{