[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Wed, 2 Oct 2024 17:03:07 -0400 (EDT) |
branch: master
commit 56c5645f3c3522383eed09febcc14c3ce8c9412a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 4 10:06:06 2024 +0200
* tp/Texinfo/XS/main/get_perl_info.c (get_converter_info_from_sv)
(set_non_customization_sv), tp/Texinfo/XS/convert/converter.c
(free_converter_initialization_info, apply_converter_info):
rename defaults_info variable as initialization_info, defaults_sv as
init_info_sv, defaults as init_info.
---
ChangeLog | 30 ++++++++++++++---------
tp/Texinfo/XS/convert/converter.c | 32 ++++++++++++-------------
tp/Texinfo/XS/convert/get_converter_perl_info.c | 26 ++++++++++----------
3 files changed, 49 insertions(+), 39 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index da6b9baa2c..2e2ef4f719 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,10 @@
-2024-10-02 Patrice Dumas <pertusus@free.fr>
-
- * tp/Texinfo/XS/convert/get_converter_perl_info.c: remove
- converter_initialize_sv.
-
- * tp/Texinfo/XS/convert/get_converter_perl_info.c
- (set_translated_commands): add converter argument.
+2024-08-04 Patrice Dumas <pertusus@free.fr>
- * tp/Texinfo/XS/convert/get_converter_perl_info.c
- (get_option_from_sv, set_non_customization_sv)
- (get_converter_defaults_from_sv, converter_get_defaults_sv),
- tp/Texinfo/XS/main/get_perl_info.c: move to get_converter_perl_info.c.
+ * tp/Texinfo/XS/main/get_perl_info.c (get_converter_info_from_sv)
+ (set_non_customization_sv), tp/Texinfo/XS/convert/converter.c
+ (free_converter_initialization_info, apply_converter_info):
+ rename defaults_info variable as initialization_info, defaults_sv as
+ init_info_sv, defaults as init_info.
2024-08-04 Patrice Dumas <pertusus@free.fr>
@@ -27,6 +22,19 @@
get_converter_info_from_sv and converter_get_defaults_sv as
converter_get_info_from_sv. Update users/callers.
+2024-10-02 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/convert/get_converter_perl_info.c: remove
+ converter_initialize_sv.
+
+ * tp/Texinfo/XS/convert/get_converter_perl_info.c
+ (set_translated_commands): add converter argument.
+
+ * tp/Texinfo/XS/convert/get_converter_perl_info.c
+ (get_option_from_sv, set_non_customization_sv)
+ (get_converter_defaults_from_sv, converter_get_defaults_sv),
+ tp/Texinfo/XS/main/get_perl_info.c: move to get_converter_perl_info.c.
+
2024-08-04 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/main/api_to_perl.c (register_perl_data),
diff --git a/tp/Texinfo/XS/convert/converter.c
b/tp/Texinfo/XS/convert/converter.c
index adbd5c09fc..dd8439156d 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -259,27 +259,27 @@ new_converter (void)
static void
apply_converter_info (CONVERTER *converter,
- CONVERTER_INITIALIZATION_INFO *defaults, int set_configured)
+ CONVERTER_INITIALIZATION_INFO *init_info, int set_configured)
{
copy_options_list_options (converter->conf, converter->sorted_options,
- &defaults->conf, set_configured);
+ &init_info->conf, set_configured);
- if (defaults->output_format)
+ if (init_info->output_format)
{
free (converter->output_format);
- converter->output_format = strdup (defaults->output_format);
+ converter->output_format = strdup (init_info->output_format);
}
- if (defaults->converted_format)
+ if (init_info->converted_format)
{
free (converter->converted_format);
- converter->converted_format = strdup (defaults->converted_format);
+ converter->converted_format = strdup (init_info->converted_format);
}
- if (defaults->translated_commands)
+ if (init_info->translated_commands)
{
destroy_translated_commands (converter->translated_commands);
- converter->translated_commands = defaults->translated_commands;
- defaults->translated_commands = 0;
+ converter->translated_commands = init_info->translated_commands;
+ init_info->translated_commands = 0;
}
}
@@ -321,17 +321,17 @@ new_converter_initialization_info (void)
}
void
-free_converter_initialization_info (CONVERTER_INITIALIZATION_INFO *defaults)
+free_converter_initialization_info (CONVERTER_INITIALIZATION_INFO *init_info)
{
- if (defaults->translated_commands)
- destroy_translated_commands (defaults->translated_commands);
+ if (init_info->translated_commands)
+ destroy_translated_commands (init_info->translated_commands);
- free (defaults->converted_format);
- free (defaults->output_format);
+ free (init_info->converted_format);
+ free (init_info->output_format);
- free_options_list (&defaults->conf);
+ free_options_list (&init_info->conf);
- free_strings_list (&defaults->non_valid_customization);
+ free_strings_list (&init_info->non_valid_customization);
}
void
diff --git a/tp/Texinfo/XS/convert/get_converter_perl_info.c
b/tp/Texinfo/XS/convert/get_converter_perl_info.c
index 551faf13d3..ba0de03eb2 100644
--- a/tp/Texinfo/XS/convert/get_converter_perl_info.c
+++ b/tp/Texinfo/XS/convert/get_converter_perl_info.c
@@ -161,7 +161,7 @@ get_option_from_sv (OPTION *option, SV *option_sv,
CONVERTER *converter,
static int
get_converter_info_from_sv (SV *conf_sv, CONVERTER *converter,
OPTION **sorted_options,
- CONVERTER_INITIALIZATION_INFO *defaults_info)
+ CONVERTER_INITIALIZATION_INFO *initialization_info)
{
dTHX;
@@ -177,13 +177,14 @@ get_converter_info_from_sv (SV *conf_sv, CONVERTER
*converter,
if (!hv_number)
return 0;
- defaults_info->conf.list
+ initialization_info->conf.list
= (OPTION *) malloc (sizeof (OPTION) * hv_number);
- memset (defaults_info->conf.list, 0, sizeof (OPTION) * hv_number);
+ memset (initialization_info->conf.list, 0, sizeof (OPTION) * hv_number);
for (i = 0; i < hv_number; i++)
{
- OPTION *option =
&defaults_info->conf.list[defaults_info->conf.number];
+ OPTION *option
+ =
&initialization_info->conf.list[initialization_info->conf.number];
char *key;
I32 retlen;
SV *value = hv_iternextsv (conf_hv, &key, &retlen);
@@ -191,23 +192,24 @@ get_converter_info_from_sv (SV *conf_sv, CONVERTER
*converter,
sorted_options, key);
if (!status)
{
- defaults_info->conf.number++;
+ initialization_info->conf.number++;
}
else
{
memset (option, 0, sizeof (OPTION));
if (status == -2)
{
- add_string (key, &defaults_info->non_valid_customization);
+ add_string (key,
+ &initialization_info->non_valid_customization);
if (!strcmp (key, "translated_commands"))
- defaults_info->translated_commands
+ initialization_info->translated_commands
= set_translated_commands (value, converter);
else if (!strcmp (key, "output_format"))
- defaults_info->output_format
+ initialization_info->output_format
= non_perl_strdup (SvPVutf8_nolen (value));
else if (!strcmp (key, "converted_format"))
- defaults_info->converted_format
+ initialization_info->converted_format
= non_perl_strdup (SvPVutf8_nolen (value));
/* TODO in defaults here means in format_defaults or
non customization variable
@@ -226,21 +228,21 @@ get_converter_info_from_sv (SV *conf_sv, CONVERTER
*converter,
}
static void
-set_non_customization_sv (HV *converter_hv, SV *defaults_sv,
+set_non_customization_sv (HV *converter_hv, SV *init_info_sv,
STRING_LIST *non_valid_customization)
{
dTHX;
if (non_valid_customization->number > 0)
{
- HV *defaults_hv = (HV *) SvRV (defaults_sv);
+ HV *init_info_hv = (HV *) SvRV (init_info_sv);
size_t i;
for (i = 0; i < non_valid_customization->number; i++)
{
const char *key
= non_valid_customization->list[i];
/* not a customization variable, set in converter */
- SV **value = hv_fetch (defaults_hv, key, strlen (key), 0);
+ SV **value = hv_fetch (init_info_hv, key, strlen (key), 0);
if (*value)
{
if (SvOK (*value))