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/converter.c (find_perl_co


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/XS/convert/converter.c (find_perl_converter_class_converter_format): handle class_name being NULL.
Date: Sat, 05 Oct 2024 05:24:18 -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 c642770e02 * tp/Texinfo/XS/convert/converter.c 
(find_perl_converter_class_converter_format): handle class_name being NULL.
c642770e02 is described below

commit c642770e02e9d7a1421bd3a415a39f6e436072b2
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 25 10:55:10 2024 +0200

    * tp/Texinfo/XS/convert/converter.c
    (find_perl_converter_class_converter_format): handle class_name being
    NULL.
    
    * tp/Texinfo/XS/convert/ConvertXS.xs (converter_defaults): initialize
    class_name.
---
 ChangeLog                                              | 9 +++++++++
 doc/tp_api/api_includes/Texinfo-Convert-Converter.texi | 3 +--
 tp/Texinfo/XS/convert/ConvertXS.xs                     | 2 +-
 tp/Texinfo/XS/convert/converter.c                      | 9 ++++++---
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db4079cb33..cff2debcf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-08-25  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/converter.c
+       (find_perl_converter_class_converter_format): handle class_name being
+       NULL.
+
+       * tp/Texinfo/XS/convert/ConvertXS.xs (converter_defaults): initialize
+       class_name.
+
 2024-08-25  Patrice Dumas  <pertusus@free.fr>
 
        * tp/texi2any.pl (%ignored_formats, %converter_format_format_name)
diff --git a/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi 
b/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi
index 949e1fa35c..142cbb0e11 100644
--- a/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi
+++ b/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi
@@ -212,8 +212,7 @@ These options are Texinfo customization options and a few 
other options that can
 be passed to the converter. Most of the customization options
 are described in the Texinfo manual or in the customization API manual.
 Those customization options, when appropriate, override the document content.
-@strong{TODO what about the other options (all are used in converters). 
Describe
-in converter_defaults?}
+@strong{TODO what about the other options?}
 
 The @code{converter} function returns a converter object (a blessed hash
 reference) after checking the options and performing some initializations.
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs 
b/tp/Texinfo/XS/convert/ConvertXS.xs
index fe406e6e9e..a0ff730d23 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -115,7 +115,7 @@ converter_defaults (SV *converter_in, SV *conf_sv)
         CONVERTER_INITIALIZATION_INFO *conf;
         CONVERTER_INITIALIZATION_INFO *format_defaults;
         CONVERTER *self = 0;
-        const char *class_name;
+        const char *class_name = 0;
         enum converter_format converter_format;
       CODE:
 
diff --git a/tp/Texinfo/XS/convert/converter.c 
b/tp/Texinfo/XS/convert/converter.c
index 6f65645c96..479827e9f4 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -191,9 +191,12 @@ find_perl_converter_class_converter_format (const char 
*class_name)
 {
   int i;
 
-  for (i = 0; i < TXI_CONVERSION_FORMAT_NR; i++)
-    if (!strcmp (converter_format_data[i].perl_converter_class, class_name))
-      return i;
+  if (class_name)
+    {
+      for (i = 0; i < TXI_CONVERSION_FORMAT_NR; i++)
+        if (!strcmp (converter_format_data[i].perl_converter_class, 
class_name))
+          return i;
+    }
 
   return COF_none;
 }



reply via email to

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