branch master updated: * tp/Texinfo/XS/Makefile.am (ConvertXS_la_SOURCES), tp/Texinfo/XS/convert/ConvertXS.xs (plain_texinfo_convert_tree): remove convert/convert_plain_texinfo.c, call convert_to_texinfo directly.

[Patrice Dumas]

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 5d9b0f09bf * tp/Texinfo/XS/Makefile.am (ConvertXS_la_SOURCES), 
tp/Texinfo/XS/convert/ConvertXS.xs (plain_texinfo_convert_tree): remove 
convert/convert_plain_texinfo.c, call convert_to_texinfo directly.
5d9b0f09bf is described below

commit 5d9b0f09bf0de252bcfb9b0a55a9d16abf0519f6
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jan 13 22:38:21 2024 +0100

    * tp/Texinfo/XS/Makefile.am (ConvertXS_la_SOURCES),
    tp/Texinfo/XS/convert/ConvertXS.xs (plain_texinfo_convert_tree):
    remove convert/convert_plain_texinfo.c, call convert_to_texinfo
    directly.
---
 ChangeLog                                     |  7 +++++
 tp/Texinfo/XS/Makefile.am                     |  2 --
 tp/Texinfo/XS/convert/ConvertXS.xs            |  3 +-
 tp/Texinfo/XS/convert/convert_plain_texinfo.c | 41 ---------------------------
 tp/Texinfo/XS/convert/convert_plain_texinfo.h |  9 ------
 5 files changed, 8 insertions(+), 54 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 96dedf8df4..63acba5c10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-01-13  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/Makefile.am (ConvertXS_la_SOURCES),
+       tp/Texinfo/XS/convert/ConvertXS.xs (plain_texinfo_convert_tree):
+       remove convert/convert_plain_texinfo.c, call convert_to_texinfo
+       directly.
+
 2024-01-13  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/call_html_perl_function.c: use strndup instead
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 3d85482b84..3763c03ad4 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -379,8 +379,6 @@ ConvertXS_la_SOURCES = \
                        convert/call_html_perl_function.c \
                        convert/get_html_perl_info.c \
                        convert/get_html_perl_info.h \
-                       convert/convert_plain_texinfo.h \
-                       convert/convert_plain_texinfo.c \
                        convert/convert_text.h \
                        convert/convert_text.c \
                        convert/converter.h \
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs 
b/tp/Texinfo/XS/convert/ConvertXS.xs
index 750537b405..c15a99bbd4 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -37,7 +37,6 @@
 #include "converter_types.h"
 #include "builtin_commands.h"
 #include "errors.h"
-#include "convert_plain_texinfo.h"
 #include "convert_text.h"
 #include "convert_to_text.h"
 #include "convert_to_texinfo.h"
@@ -294,7 +293,7 @@ plain_texinfo_convert_tree (SV *tree_in)
         document = get_sv_tree_document (tree_in, 0);
         if (document)
           {
-            char *result = plain_texinfo_convert (document);
+            char *result = convert_to_texinfo (document->tree);
             RETVAL = newSVpv_utf8 (result, 0);
             free (result);
           }
diff --git a/tp/Texinfo/XS/convert/convert_plain_texinfo.c 
b/tp/Texinfo/XS/convert/convert_plain_texinfo.c
deleted file mode 100644
index 2afd0b6626..0000000000
--- a/tp/Texinfo/XS/convert/convert_plain_texinfo.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2023 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include <config.h>
-
-#include <string.h>
-
-#include "converter_types.h"
-#include "convert_to_texinfo.h"
-#include "convert_plain_texinfo.h"
-
-char *
-plain_texinfo_convert (DOCUMENT *document)
-{
-  char *result;
-  /* FIXME warn/error?  Or in the .xs code? */
-  if (!document)
-    {
-      return strdup ("");
-    }
-  result = convert_to_texinfo (document->tree);
-
-  /*
-  fprintf (stderr, "PLAIN TEXI: using XS: '%.100s'\n", result);
-   */
-
-  return result;
-}
-
diff --git a/tp/Texinfo/XS/convert/convert_plain_texinfo.h 
b/tp/Texinfo/XS/convert/convert_plain_texinfo.h
deleted file mode 100644
index 8eaf414e61..0000000000
--- a/tp/Texinfo/XS/convert/convert_plain_texinfo.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* convert_plain_texinfo.h - definitions for convert_plain_texinfo.c */
-#ifndef CONVERT_PLAIN_TEXINFO_H
-#define CONVERT_PLAIN_TEXINFO_H
-
-#include "document_types.h"
-
-char *plain_texinfo_convert (DOCUMENT *document);
-
-#endif