[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Mon, 23 Dec 2024 17:44:50 -0500 (EST) |
branch: master
commit b6860609a78264068b42e2fe95f3a6a8112479a1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Dec 7 22:06:32 2024 +0100
* tp/Texinfo/XS/convert/texinfo.c, tp/Texinfo/XS/teximakehtml.c
(set_customization_default, main): remove
txi_config_set_customization_default from texinfo.c and add the
similar set_customization_default function to teximakehtml.c.
---
ChangeLog | 7 +++++++
tp/Texinfo/XS/convert/texinfo.c | 13 -------------
tp/Texinfo/XS/convert/texinfo.h | 2 --
tp/Texinfo/XS/teximakehtml.c | 16 ++++++++++++++--
4 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c6ce874845..9e8738a218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-12-07 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/convert/texinfo.c, tp/Texinfo/XS/teximakehtml.c
+ (set_customization_default, main): remove
+ txi_config_set_customization_default from texinfo.c and add the
+ similar set_customization_default function to teximakehtml.c.
+
2024-12-07 Patrice Dumas <pertusus@free.fr>
Fix memory leaks in teximakehtml (from valgrind)
diff --git a/tp/Texinfo/XS/convert/texinfo.c b/tp/Texinfo/XS/convert/texinfo.c
index 82c451503d..12c09f2a1d 100644
--- a/tp/Texinfo/XS/convert/texinfo.c
+++ b/tp/Texinfo/XS/convert/texinfo.c
@@ -509,16 +509,3 @@ txi_handle_converter_error_messages (CONVERTER *converter,
int no_warn,
return handle_error_messages (&converter->error_messages, no_warn,
use_filename, message_encoding);
}
-
-/* Texinfo::Config */
-int
-txi_config_set_customization_default (OPTIONS_LIST *options_defaults,
- OPTIONS_LIST *cmdline_options, const OPTION *option)
-{
- if (option_number_in_option_list (cmdline_options, option->number))
- return 0;
-
- options_list_add_option_number (options_defaults, option->number, 1);
- copy_option (options_defaults->sorted_options[option->number -1], option);
- return 1;
-}
diff --git a/tp/Texinfo/XS/convert/texinfo.h b/tp/Texinfo/XS/convert/texinfo.h
index 94a32a4799..820e6df72d 100644
--- a/tp/Texinfo/XS/convert/texinfo.h
+++ b/tp/Texinfo/XS/convert/texinfo.h
@@ -69,6 +69,4 @@ void txi_document_remove (DOCUMENT *document);
void txi_converter_reset (CONVERTER *converter);
void txi_converter_destroy (CONVERTER *converter);
-int txi_config_set_customization_default (OPTIONS_LIST *options_defaults,
- OPTIONS_LIST *cmdline_options, const OPTION *option);
#endif
diff --git a/tp/Texinfo/XS/teximakehtml.c b/tp/Texinfo/XS/teximakehtml.c
index d544243fa1..5b4359fcf9 100644
--- a/tp/Texinfo/XS/teximakehtml.c
+++ b/tp/Texinfo/XS/teximakehtml.c
@@ -91,6 +91,7 @@ enum teximakehtml_mode {
TEXIMAKEHTML_mode_demo,
};
+/* Texinfo::Config */
static OPTION *
get_conf (size_t number)
{
@@ -103,6 +104,17 @@ get_conf (size_t number)
return 0;
}
+static int
+set_customization_default (const OPTION *option)
+{
+ if (option_number_in_option_list (&cmdline_options, option->number))
+ return 0;
+
+ options_list_add_option_number (&program_options, option->number, 1);
+ copy_option (program_options.sorted_options[option->number -1], option);
+ return 1;
+}
+
static char *
decode_input (char *text)
{
@@ -442,8 +454,8 @@ main (int argc, char *argv[])
fprintf (stderr, "FORMAT_MENU %s\n",
format_defaults->conf.options->FORMAT_MENU.o.string);
*/
- txi_config_set_customization_default (&program_options, &cmdline_options,
- &format_defaults->conf.options->FORMAT_MENU);
+ set_customization_default (
+ &format_defaults->conf.options->FORMAT_MENU);
}
destroy_converter_initialization_info (format_defaults);