texinfo-commits
[Top][All Lists]
Advanced

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

[no subject]


From: Patrice Dumas
Date: Wed, 2 Oct 2024 17:03:08 -0400 (EDT)

branch: master
commit 9f3ad16bcdbf851ca205844ffc15fa027e903f92
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 4 10:15:09 2024 +0200

    * tp/Texinfo/XS/convert/converter.c
    (destroy_converter_initialization_info): rename
    free_converter_initialization_info as
    destroy_converter_initialization_info.  Free the
    CONVERTER_INITIALIZATION_INFO argument.
    
    * tp/Texinfo/XS/main/document.c
    (destroy_document_information_except_tree): free sorted_options.
---
 ChangeLog                          | 11 +++++++++++
 tp/Texinfo/XS/convert/ConvertXS.xs |  4 ++--
 tp/Texinfo/XS/convert/converter.c  |  3 ++-
 tp/Texinfo/XS/convert/converter.h  |  2 +-
 tp/Texinfo/XS/main/document.c      |  2 ++
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2e2ef4f719..82e9cc6421 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-08-04  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/converter.c
+       (destroy_converter_initialization_info): rename
+       free_converter_initialization_info as
+       destroy_converter_initialization_info.  Free the
+       CONVERTER_INITIALIZATION_INFO argument.
+
+       * tp/Texinfo/XS/main/document.c
+       (destroy_document_information_except_tree): free sorted_options.
+
 2024-08-04  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/main/get_perl_info.c (get_converter_info_from_sv)
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs 
b/tp/Texinfo/XS/convert/ConvertXS.xs
index 6cf30145ef..61f239de3a 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -108,8 +108,8 @@ converter_initialize (SV *converter_in, const char *class, 
SV *format_defaults_s
 
          set_converter_init_information (self, format_defaults, conf);
 
-         free_converter_initialization_info (format_defaults);
-         free_converter_initialization_info (conf);
+         destroy_converter_initialization_info (format_defaults);
+         destroy_converter_initialization_info (conf);
 
          pass_generic_converter_to_converter_sv (converter_in, self);
 
diff --git a/tp/Texinfo/XS/convert/converter.c 
b/tp/Texinfo/XS/convert/converter.c
index dd8439156d..3fc3733a0a 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -321,7 +321,7 @@ new_converter_initialization_info (void)
 }
 
 void
-free_converter_initialization_info (CONVERTER_INITIALIZATION_INFO *init_info)
+destroy_converter_initialization_info (CONVERTER_INITIALIZATION_INFO 
*init_info)
 {
   if (init_info->translated_commands)
     destroy_translated_commands (init_info->translated_commands);
@@ -332,6 +332,7 @@ free_converter_initialization_info 
(CONVERTER_INITIALIZATION_INFO *init_info)
   free_options_list (&init_info->conf);
 
   free_strings_list (&init_info->non_valid_customization);
+  free (init_info);
 }
 
 void
diff --git a/tp/Texinfo/XS/convert/converter.h 
b/tp/Texinfo/XS/convert/converter.h
index 0904ed08e1..7f9c05f8ff 100644
--- a/tp/Texinfo/XS/convert/converter.h
+++ b/tp/Texinfo/XS/convert/converter.h
@@ -117,7 +117,7 @@ void set_converter_init_information (CONVERTER *converter,
                           CONVERTER_INITIALIZATION_INFO *user_conf);
 
 CONVERTER_INITIALIZATION_INFO *new_converter_initialization_info (void);
-void free_converter_initialization_info (
+void destroy_converter_initialization_info (
                             CONVERTER_INITIALIZATION_INFO *defaults);
 
 void converter_set_document (CONVERTER *converter, DOCUMENT *document);
diff --git a/tp/Texinfo/XS/main/document.c b/tp/Texinfo/XS/main/document.c
index 48cf3b289f..87d34fb727 100644
--- a/tp/Texinfo/XS/main/document.c
+++ b/tp/Texinfo/XS/main/document.c
@@ -410,6 +410,8 @@ destroy_document_information_except_tree (DOCUMENT 
*document)
       free_options (document->options);
       free (document->options);
     }
+  if (document->sorted_options)
+    free (document->sorted_options);
   if (document->convert_index_text_options)
     destroy_text_options (document->convert_index_text_options);
 



reply via email to

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