texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/XS/main/build_perl_info.c, tp/Texinf


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/XS/main/build_perl_info.c, tp/Texinfo/XS/parsetexi/Parsetexi.xs (init): move build_perl_info.c init code to Parsetexi.xs init and remove build_perl_info.c init function.
Date: Sat, 19 Oct 2024 05:12:54 -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 3203080a50 * tp/Texinfo/XS/main/build_perl_info.c, 
tp/Texinfo/XS/parsetexi/Parsetexi.xs (init): move build_perl_info.c init code 
to Parsetexi.xs init and remove build_perl_info.c init function.
3203080a50 is described below

commit 3203080a5002f1504eace4d1617ce2464825da5e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Oct 19 11:12:46 2024 +0200

    * tp/Texinfo/XS/main/build_perl_info.c,
    tp/Texinfo/XS/parsetexi/Parsetexi.xs (init): move build_perl_info.c
    init code to Parsetexi.xs init and remove build_perl_info.c init
    function.
---
 ChangeLog                            |  7 +++++++
 tp/Texinfo/XS/main/build_perl_info.c | 10 ----------
 tp/Texinfo/XS/main/build_perl_info.h |  3 ---
 tp/Texinfo/XS/parsetexi/Parsetexi.xs | 11 +++++++++--
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 391b41c096..e51ef87787 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-10-19  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/main/build_perl_info.c,
+       tp/Texinfo/XS/parsetexi/Parsetexi.xs (init): move build_perl_info.c
+       init code to Parsetexi.xs init and remove build_perl_info.c init
+       function.
+
 2024-10-19  Patrice Dumas  <pertusus@free.fr>
 
        * tp/maintain/generate_code_convert_data.pl: replace incorrect
diff --git a/tp/Texinfo/XS/main/build_perl_info.c 
b/tp/Texinfo/XS/main/build_perl_info.c
index 4e34175e2e..d833ccb709 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -150,16 +150,6 @@ perl_only_strndup (const char *s, size_t n)
   return ret;
 }
 
-/* called once at loading time */
-int
-init (int texinfo_uninstalled, SV *converterdatadir_sv, SV *builddir_sv,
-      SV *top_srcdir_sv)
-{
-  txi_base_setup ();
-
-  return 1;
-}
-
 
 /* Build Texinfo tree data and Texinfo tree to Perl */
 
diff --git a/tp/Texinfo/XS/main/build_perl_info.h 
b/tp/Texinfo/XS/main/build_perl_info.h
index 2b36f99fca..c4be69cce2 100644
--- a/tp/Texinfo/XS/main/build_perl_info.h
+++ b/tp/Texinfo/XS/main/build_perl_info.h
@@ -21,9 +21,6 @@ void *perl_only_malloc (size_t size);
 char *perl_only_strdup (const char *s);
 char *perl_only_strndup (const char *s, size_t n);
 
-int init (int texinfo_uninstalled, SV *converterdatadir_sv, SV *builddir_sv,
-          SV *top_srcdir_sv);
-
 /* in call_perl_function.c, but declared here to avoid pulling in Perl
    headers in call_perl_function.h */
 /* does not exist as perl macro */
diff --git a/tp/Texinfo/XS/parsetexi/Parsetexi.xs 
b/tp/Texinfo/XS/parsetexi/Parsetexi.xs
index dd6338a0c0..c4364fdc79 100644
--- a/tp/Texinfo/XS/parsetexi/Parsetexi.xs
+++ b/tp/Texinfo/XS/parsetexi/Parsetexi.xs
@@ -34,6 +34,8 @@
 
 #include "api.h"
 #include "conf.h"
+/* for txi_base_setup */
+#include "utils.h"
 #include "parser_conf.h"
 #include "build_perl_info.h"
 #include "get_perl_info.h"
@@ -54,10 +56,15 @@ PROTOTYPES: ENABLE
 # encodings, they are never decoded/encoded but used as is
 # and passed as byte strings.
 
-# Called from Texinfo::XSLoader.pm.  The arguments are not actually used.
-# File paths are byte strings and can be in any encoding.
+# Called once from Texinfo::XSLoader.pm at loading time.
+# File paths (not used) are byte strings and can be in any encoding.
 int
 init (int texinfo_uninstalled, SV *converterdatadir, SV *tp_builddir, SV 
*top_srcdir)
+    CODE:
+      txi_base_setup ();
+      RETVAL = 1;
+    OUTPUT:
+      RETVAL
 
 void
 reset_parser (int debug_output)



reply via email to

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