branch master updated: * tp/Texinfo/XS/convert/converter.c (txi_paths_info) (setup_txi_paths_information, generic_setup_main_converter): rename conversion_paths_info as txi_paths_info, setup_converter_paths_information as setup_txi_paths_information and converter_setup as generic_setup_main_converter.

[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 00d2b06075 * tp/Texinfo/XS/convert/converter.c (txi_paths_info) 
(setup_txi_paths_information, generic_setup_main_converter): rename 
conversion_paths_info as txi_paths_info, setup_converter_paths_information as 
setup_txi_paths_information and converter_setup as generic_setup_main_converter.
00d2b06075 is described below

commit 00d2b06075d7b65a8f4484b429b354e29991827c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jan 4 23:25:13 2025 +0100

    * tp/Texinfo/XS/convert/converter.c (txi_paths_info)
    (setup_txi_paths_information, generic_setup_main_converter): rename
    conversion_paths_info as txi_paths_info,
    setup_converter_paths_information as setup_txi_paths_information and
    converter_setup as generic_setup_main_converter.
---
 ChangeLog                                      |  8 ++++++
 tp/Texinfo/XS/convert/ConvertXS.xs             |  4 +--
 tp/Texinfo/XS/convert/convert_html.c           | 12 ++++-----
 tp/Texinfo/XS/convert/converter.c              | 35 +++++++++++++-------------
 tp/Texinfo/XS/convert/converter.h              |  5 ++--
 tp/Texinfo/XS/convert/html_prepare_converter.c |  6 ++---
 tp/Texinfo/XS/convert/texinfo.c                | 16 ++++++------
 tp/Texinfo/XS/texi2any.c                       | 12 ++++-----
 8 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed41525bf8..d3b25775b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2025-01-04  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/converter.c (txi_paths_info)
+       (setup_txi_paths_information, generic_setup_main_converter): rename
+       conversion_paths_info as txi_paths_info,
+       setup_converter_paths_information as setup_txi_paths_information and
+       converter_setup as generic_setup_main_converter.
+
 2025-01-04  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/texinfo.c (txi_general_setup),
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs 
b/tp/Texinfo/XS/convert/ConvertXS.xs
index 165de51e5e..5ffc9755d2 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -92,8 +92,8 @@ init (SV *texinfo_uninstalled_sv, SV *converterdatadir_sv, SV 
*tp_builddir_sv, S
         else
           converterdatadir = SvPVbyte_nolen (converterdatadir_sv);
 
-        converter_setup (texinfo_uninstalled, converterdatadir, tp_builddir,
-                         top_srcdir);
+        generic_setup_main_converter (texinfo_uninstalled, converterdatadir,
+                                      tp_builddir, top_srcdir);
         RETVAL = 1;
     OUTPUT:
         RETVAL
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index e5ed7c9647..52f49cbdb7 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -59,7 +59,7 @@
 #include "call_html_perl_function.h"
 /* for unregister_document_merge_with_document */
 #include "document.h"
-/* conversion_paths_info create_destination_directory
+/* txi_paths_info create_destination_directory
    set_global_document_commands clear_tree_added_elements
    register_normalize_case_filename */
 #include "converter.h"
@@ -2617,19 +2617,19 @@ html_do_js_files (CONVERTER *self)
           int i;
           if (self->conf->TEST.o.integer <= 0)
             {
-              /* conversion_paths_info paths are byte strings */
+              /* txi_paths_info paths are byte strings */
               char *jssrcdir;
-              if (!conversion_paths_info.texinfo_uninstalled)
+              if (!txi_paths_info.texinfo_uninstalled)
                 {
                   xasprintf (&jssrcdir, "%s/%s",
-                        conversion_paths_info.p.installed.converterdatadir,
+                        txi_paths_info.p.installed.converterdatadir,
                              "js");
                 }
               else
                 {
-                  if (conversion_paths_info.p.uninstalled.top_srcdir)
+                  if (txi_paths_info.p.uninstalled.top_srcdir)
                     xasprintf (&jssrcdir, "%s/%s",
-                               conversion_paths_info.p.uninstalled.top_srcdir,
+                               txi_paths_info.p.uninstalled.top_srcdir,
                                "js");
                   else
                     jssrcdir = strdup ("js");
diff --git a/tp/Texinfo/XS/convert/converter.c 
b/tp/Texinfo/XS/convert/converter.c
index 5c98a00685..72a8cb5e9d 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -123,7 +123,7 @@ static CONVERTER **converter_list;
 static size_t converter_number;
 static size_t converter_space;
 
-PATHS_INFORMATION conversion_paths_info;
+PATHS_INFORMATION txi_paths_info;
 
 const char *xml_text_entity_no_arg_commands_formatting[BUILTIN_CMD_NUMBER];
 
@@ -140,24 +140,24 @@ free_converter_paths_information (PATHS_INFORMATION 
*paths_info)
 }
 
 static void
-setup_converter_paths_information (int texinfo_uninstalled,
-                                   const char *converterdatadir,
-                                   const char *tp_builddir,
-                                   const char *top_srcdir)
-{
-  free_converter_paths_information (&conversion_paths_info);
-  memset (&conversion_paths_info, 0, sizeof (PATHS_INFORMATION));
-  conversion_paths_info.texinfo_uninstalled = texinfo_uninstalled;
+setup_txi_paths_information (int texinfo_uninstalled,
+                             const char *converterdatadir,
+                             const char *tp_builddir,
+                             const char *top_srcdir)
+{
+  free_converter_paths_information (&txi_paths_info);
+  memset (&txi_paths_info, 0, sizeof (PATHS_INFORMATION));
+  txi_paths_info.texinfo_uninstalled = texinfo_uninstalled;
   if (texinfo_uninstalled)
     {
       if (tp_builddir)
         {
-          conversion_paths_info.p.uninstalled.tp_builddir
+          txi_paths_info.p.uninstalled.tp_builddir
             = strdup (tp_builddir);
         }
       if (top_srcdir)
         {
-          conversion_paths_info.p.uninstalled.top_srcdir
+          txi_paths_info.p.uninstalled.top_srcdir
             = strdup (top_srcdir);
         }
     }
@@ -165,13 +165,13 @@ setup_converter_paths_information (int 
texinfo_uninstalled,
     {
       if (converterdatadir)
         {
-          conversion_paths_info.p.installed.converterdatadir
+          txi_paths_info.p.installed.converterdatadir
             = strdup (converterdatadir);
         }
     }
 }
 
-static int converter_setup_called;
+static int generic_setup_main_converter_called;
 
 /* should be called only once.  Except that it may be called both
    from C and from an embedded Perl module initialization, so
@@ -180,19 +180,20 @@ static int converter_setup_called;
    $embedded_xs is set, under the assumption that the corresponding
    code would already be called in C code? */
 void
-converter_setup (int texinfo_uninstalled, const char *converterdatadir,
+generic_setup_main_converter (int texinfo_uninstalled,
+                              const char *converterdatadir,
                  const char *tp_builddir, const char *top_srcdir)
 {
   int i;
 
   /* used in converters and in main C program at earlier steps */
-  setup_converter_paths_information (texinfo_uninstalled,
+  setup_txi_paths_information (texinfo_uninstalled,
                              converterdatadir, tp_builddir, top_srcdir);
 
-  if (converter_setup_called)
+  if (generic_setup_main_converter_called)
     return;
 
-  converter_setup_called = 1;
+  generic_setup_main_converter_called = 1;
 
   set_element_type_name_info ();
   txi_initialise_base_options ();
diff --git a/tp/Texinfo/XS/convert/converter.h 
b/tp/Texinfo/XS/convert/converter.h
index f67e1e9220..57122ecea9 100644
--- a/tp/Texinfo/XS/convert/converter.h
+++ b/tp/Texinfo/XS/convert/converter.h
@@ -129,11 +129,12 @@ extern const char 
*xml_text_entity_no_arg_commands_formatting[];
 
 extern COMMAND_ACCENT_ENTITY_INFO xml_accent_text_entities[];
 
-extern PATHS_INFORMATION conversion_paths_info;
+extern PATHS_INFORMATION txi_paths_info;
 
 extern CONVERTER_FORMAT_DATA converter_format_data[];
 
-void converter_setup (int texinfo_uninstalled, const char *converterdatadir,
+void generic_setup_main_converter (int texinfo_uninstalled,
+                                   const char *converterdatadir,
                       const char *tp_builddir, const char *top_srcdir);
 
 enum converter_format find_format_name_converter_format (const char *format);
diff --git a/tp/Texinfo/XS/convert/html_prepare_converter.c 
b/tp/Texinfo/XS/convert/html_prepare_converter.c
index 6f780a539d..c3d392e844 100644
--- a/tp/Texinfo/XS/convert/html_prepare_converter.c
+++ b/tp/Texinfo/XS/convert/html_prepare_converter.c
@@ -1115,13 +1115,13 @@ load_htmlxref_files (CONVERTER *self)
         {
           /* to have reproducible tests, do not use system or user
              directories if TEST is set. */
-          if (conversion_paths_info.texinfo_uninstalled)
+          if (txi_paths_info.texinfo_uninstalled)
             {
-              if (conversion_paths_info.p.uninstalled.top_srcdir)
+              if (txi_paths_info.p.uninstalled.top_srcdir)
                 {
                   char *path;
                   xasprintf (&path, "%s/tp/t/input_files",
-                             conversion_paths_info.p.uninstalled.top_srcdir);
+                             txi_paths_info.p.uninstalled.top_srcdir);
                   add_string (path, &htmlxref_dirs);
                   free (path);
                 }
diff --git a/tp/Texinfo/XS/convert/texinfo.c b/tp/Texinfo/XS/convert/texinfo.c
index 27094f43d3..cabd47d991 100644
--- a/tp/Texinfo/XS/convert/texinfo.c
+++ b/tp/Texinfo/XS/convert/texinfo.c
@@ -111,15 +111,15 @@ txi_general_setup (int use_external_translate_string)
   char *locales_dir;
 
   /* code in texinfo.pl */
-  if (conversion_paths_info.texinfo_uninstalled)
+  if (txi_paths_info.texinfo_uninstalled)
     {
       struct stat finfo;
       int not_found = 1;
 
-      if (conversion_paths_info.p.uninstalled.tp_builddir)
+      if (txi_paths_info.p.uninstalled.tp_builddir)
         {
           xasprintf (&locales_dir, "%s/LocaleData",
-                     conversion_paths_info.p.uninstalled.tp_builddir);
+                     txi_paths_info.p.uninstalled.tp_builddir);
 
           if (stat (locales_dir, &finfo) == 0 && S_ISDIR (finfo.st_mode))
             {
@@ -132,10 +132,10 @@ txi_general_setup (int use_external_translate_string)
       if (not_found)
         fprintf (stderr, "Locales dir for document strings not found\n");
     }
-  else if (conversion_paths_info.p.installed.converterdatadir)
+  else if (txi_paths_info.p.installed.converterdatadir)
     {
       xasprintf (&locales_dir, "%s/locale",
-                 conversion_paths_info.p.installed.converterdatadir);
+                 txi_paths_info.p.installed.converterdatadir);
       configure_output_strings_translations (locales_dir, 0,
                                            use_external_translate_string);
     }
@@ -155,13 +155,13 @@ txi_customization_loading_setup (int embedded_interpreter,
     {
       char *load_modules_path;
       int status;
-      if (conversion_paths_info.texinfo_uninstalled)
+      if (txi_paths_info.texinfo_uninstalled)
         xasprintf (&load_modules_path, "%s/tp/%s.pl",
-                      conversion_paths_info.p.uninstalled.top_srcdir,
+                      txi_paths_info.p.uninstalled.top_srcdir,
                                        load_txi_modules_basename);
       else
         xasprintf (&load_modules_path, "%s/%s",
-                  conversion_paths_info.p.installed.converterdatadir,
+                  txi_paths_info.p.installed.converterdatadir,
                    load_txi_modules_basename);
       status = call_init_perl (argc_ref, argv_ref, env_ref, load_modules_path,
                                version_checked);
diff --git a/tp/Texinfo/XS/texi2any.c b/tp/Texinfo/XS/texi2any.c
index 8b54c96d84..377496ef99 100644
--- a/tp/Texinfo/XS/texi2any.c
+++ b/tp/Texinfo/XS/texi2any.c
@@ -66,7 +66,7 @@
 /* output_files_open_out output_files_register_closed */
 #include "convert_utils.h"
 /* destroy_converter_initialization_info new_converter_initialization_info
-   encoded_output_file_name converter_setup */
+   encoded_output_file_name generic_setup_main_converter */
 #include "converter.h"
 /* for html_output_internal_links */
 #include "html_converter_api.h"
@@ -1102,8 +1102,8 @@ main (int argc, char *argv[], char *env[])
      Done earlier than in Perl because options defaults are used in help
      and paths setup for converters are used to locate file used for
      interpreter embedding */
-  converter_setup (texinfo_uninstalled, converterdatadir, tp_builddir,
-                   top_srcdir);
+  generic_setup_main_converter (texinfo_uninstalled, converterdatadir,
+                                tp_builddir, top_srcdir);
   free (tp_builddir);
   free (top_srcdir);
 
@@ -1922,12 +1922,12 @@ main (int argc, char *argv[], char *env[])
   output_format = output_format_option->o.string;
 
   if (!test_mode_set
-      && conversion_paths_info.texinfo_uninstalled
-      && conversion_paths_info.p.uninstalled.top_srcdir)
+      && txi_paths_info.texinfo_uninstalled
+      && txi_paths_info.p.uninstalled.top_srcdir)
     {
       char *in_source_util_dir;
       xasprintf (&in_source_util_dir, "%s/util",
-                 conversion_paths_info.p.uninstalled.top_srcdir);
+                 txi_paths_info.p.uninstalled.top_srcdir);
       add_string (in_source_util_dir, texinfo_language_config_dirs);
       free (in_source_util_dir);
     }