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/convert_html.c (html_free


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/XS/convert/convert_html.c (html_free_converter), tp/Texinfo/XS/convert/converter.c (free_generic_converter): move debug message if error messages not empty to free_generic_converter.
Date: Fri, 04 Oct 2024 06:12:12 -0400

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 27c776c861 * tp/Texinfo/XS/convert/convert_html.c 
(html_free_converter), tp/Texinfo/XS/convert/converter.c 
(free_generic_converter): move debug message if error messages not empty to 
free_generic_converter.
27c776c861 is described below

commit 27c776c86142a2a5fe48a6ffd0b111b130674d23
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 11 13:07:57 2024 +0200

    * tp/Texinfo/XS/convert/convert_html.c (html_free_converter),
    tp/Texinfo/XS/convert/converter.c (free_generic_converter): move debug
    message if error messages not empty to free_generic_converter.
---
 ChangeLog                            |  6 ++++++
 tp/Texinfo/XS/convert/convert_html.c | 15 ++-------------
 tp/Texinfo/XS/convert/converter.c    | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8f083a401d..8b99d0264c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-08-11  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/convert_html.c (html_free_converter),
+       tp/Texinfo/XS/convert/converter.c (free_generic_converter): move debug
+       message if error messages not empty to free_generic_converter.
+
 2024-08-11  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/ConvertXS.xs (destroy, reset_converter): use C
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index 8bdc1ad392..300367874e 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -19794,22 +19794,11 @@ html_free_converter (CONVERTER *self)
   EXPLAINED_COMMAND_TYPE_LIST *type_explanations
    = &self->shared_conversion_state.explained_commands;
 
+  free_generic_converter (self);
+
   /* useful only if html_reset_converter was not called previously */
   reset_translated_special_unit_info_tree (self);
 
-  if (self->error_messages.number)
-    {
-      fprintf (stderr, "BUG: %zu ignored messages in HTML conversion\n",
-                       self->error_messages.number);
-      for (i = 0; i < self->error_messages.number; i++)
-        {
-          const ERROR_MESSAGE *error_message = &self->error_messages.list[i];
-          fprintf (stderr, " %d: %s", i, error_message->error_line);
-        }
-    }
-
-  free_generic_converter (self);
-
   free_special_unit_info_list (&self->customized_special_unit_info);
 
   free_strings_list (&self->customized_special_unit_varieties);
diff --git a/tp/Texinfo/XS/convert/converter.c 
b/tp/Texinfo/XS/convert/converter.c
index 9b0e5db159..af32234382 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -1593,6 +1593,25 @@ destroy_translated_commands (TRANSLATED_COMMAND 
*translated_commands)
 void
 free_generic_converter (CONVERTER *self)
 {
+  size_t i;
+
+  if (self->error_messages.number)
+    {
+      const char *converter_name;
+      if (self->format >= 0)
+        converter_name = converter_format_data[self->format].default_format;
+      else
+        converter_name = "generic";
+
+      fprintf (stderr, "BUG: %zu ignored messages in %s converter\n",
+                       self->error_messages.number, converter_name);
+      for (i = 0; i < self->error_messages.number; i++)
+        {
+          const ERROR_MESSAGE *error_message = &self->error_messages.list[i];
+          fprintf (stderr, " %zu: %s", i, error_message->error_line);
+        }
+    }
+
   if (self->translated_commands)
     {
       destroy_translated_commands (self->translated_commands);



reply via email to

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