texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Texinfo/XS/convert/texinfo.c (txi_converter_


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/XS/convert/texinfo.c (txi_converter_output): allow output_files_information to be NULL.
Date: Thu, 02 Jan 2025 06:03:33 -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 1bfea89ec3 * tp/Texinfo/XS/convert/texinfo.c (txi_converter_output): 
allow output_files_information to be NULL.
1bfea89ec3 is described below

commit 1bfea89ec33ee445af60fb9cb7b50d11bc28aaea
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Jan 2 12:02:49 2025 +0100

    * tp/Texinfo/XS/convert/texinfo.c (txi_converter_output): allow
    output_files_information to be NULL.
---
 ChangeLog                       |  5 +++++
 tp/Texinfo/XS/convert/texinfo.c | 23 +++++++++++++----------
 tp/Texinfo/XS/texi2any.c        |  2 ++
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 00da004736..162538001e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2025-01-02  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/texinfo.c (txi_converter_output): allow
+       output_files_information to be NULL.
+
 2025-01-02  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/texi2any.c (long_options, main): remove the
diff --git a/tp/Texinfo/XS/convert/texinfo.c b/tp/Texinfo/XS/convert/texinfo.c
index b415ab685e..98ca1150ca 100644
--- a/tp/Texinfo/XS/convert/texinfo.c
+++ b/tp/Texinfo/XS/convert/texinfo.c
@@ -531,18 +531,21 @@ txi_converter_output (const char *external_module,
           free (output_text_files_info->text);
         }
 
-      copy_strings (&converter->output_files_information.opened_files,
-                    &output_files_information->opened_files);
-      /* copy unclosed files */
-      for (i = 0; i < unclosed_files->number; i++)
+      if (output_files_information)
         {
-          register_unclosed_file (
-               &converter->output_files_information,
-               unclosed_files->list[i].file_path,
-               unclosed_files->list[i].stream);
+          copy_strings (&converter->output_files_information.opened_files,
+                        &output_files_information->opened_files);
+          /* copy unclosed files */
+          for (i = 0; i < unclosed_files->number; i++)
+            {
+              register_unclosed_file (
+                   &converter->output_files_information,
+                   unclosed_files->list[i].file_path,
+                   unclosed_files->list[i].stream);
+            }
+          free_output_files_information (output_files_information);
+          free (output_files_information);
         }
-      free_output_files_information (output_files_information);
-      free (output_files_information);
       free (output_text_files_info);
       return text_result;
     }
diff --git a/tp/Texinfo/XS/texi2any.c b/tp/Texinfo/XS/texi2any.c
index ffc6af32df..928545926c 100644
--- a/tp/Texinfo/XS/texi2any.c
+++ b/tp/Texinfo/XS/texi2any.c
@@ -1841,6 +1841,8 @@ main (int argc, char *argv[], char *env[])
     {
       if (!strcmp (converted_format, "html"))
         {
+          /* TODO INTERNAL_LINKS implemented in C anymore, but need to do
+             an XS interface */
           OPTION *internal_links_option
             = GNUT_get_conf (program_options.options->INTERNAL_LINKS.number);
           /* setup of need_latex to be kept in sync with setup of



reply via email to

[Prev in Thread] Current Thread [Next in Thread]