branch master updated: Do not use unnamed union for 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 5614996a85 Do not use unnamed union for CONVERTER
5614996a85 is described below

commit 5614996a85511cf7f4263b7fd7611f54a0ffda98
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Jun 6 17:39:59 2024 +0200

    Do not use unnamed union for CONVERTER
    
    * tp/Texinfo/XS/main/converter_types.h (CONVERTER): rename the
    registered ids union as rid.  Update codes using the corresponding
    union fields.
---
 ChangeLog                                       |  8 ++++++++
 tp/Texinfo/XS/convert/call_html_perl_function.c | 11 ++++++-----
 tp/Texinfo/XS/main/converter_types.h            |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7c8f5ac2e3..00525f53e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-06-06  Patrice Dumas  <pertusus@free.fr>
+
+       Do not use unnamed union for CONVERTER
+
+       * tp/Texinfo/XS/main/converter_types.h (CONVERTER): rename the
+       registered ids union as rid.  Update codes using the corresponding
+       union fields.
+
 2024-06-06  Patrice Dumas  <pertusus@free.fr>
 
        Do not use unnamed union for COMMAND_OR_TYPE
diff --git a/tp/Texinfo/XS/convert/call_html_perl_function.c 
b/tp/Texinfo/XS/convert/call_html_perl_function.c
index 010a2216c7..a95c6d2f77 100644
--- a/tp/Texinfo/XS/convert/call_html_perl_function.c
+++ b/tp/Texinfo/XS/convert/call_html_perl_function.c
@@ -2319,7 +2319,7 @@ init_registered_ids_hv (CONVERTER *self)
 {
   dTHX;
 
-  self->registered_ids_hv = newHV ();
+  self->rid.registered_ids_hv = newHV ();
 }
 
 int
@@ -2327,7 +2327,7 @@ is_hv_registered_id (CONVERTER *self, const char *string)
 {
   dTHX;
 
-  return hv_exists (self->registered_ids_hv, string, strlen (string));
+  return hv_exists (self->rid.registered_ids_hv, string, strlen (string));
 }
 
 void
@@ -2335,7 +2335,8 @@ hv_register_id (CONVERTER *self, const char *string)
 {
   dTHX;
 
-  hv_store (self->registered_ids_hv, string, strlen (string), newSViv (1), 0);
+  hv_store (self->rid.registered_ids_hv, string, strlen (string),
+            newSViv (1), 0);
 }
 
 void
@@ -2343,7 +2344,7 @@ clear_registered_ids_hv (CONVERTER *self)
 {
   dTHX;
 
-  hv_clear (self->registered_ids_hv);
+  hv_clear (self->rid.registered_ids_hv);
 }
 
 void
@@ -2351,5 +2352,5 @@ free_registered_ids_hv (CONVERTER *self)
 {
   dTHX;
 
-  hv_undef (self->registered_ids_hv);
+  hv_undef (self->rid.registered_ids_hv);
 }
diff --git a/tp/Texinfo/XS/main/converter_types.h 
b/tp/Texinfo/XS/main/converter_types.h
index 2625556dac..e9ac233589 100644
--- a/tp/Texinfo/XS/main/converter_types.h
+++ b/tp/Texinfo/XS/main/converter_types.h
@@ -779,7 +779,7 @@ typedef struct CONVERTER {
       STRING_LIST *registered_ids;
       /* actually HV * but we do not want to drag in Perl headers */
       void *registered_ids_hv;
-    };
+    } rid;
     /* potentially one target list per command (only for some actually) */
     HTML_TARGET_LIST html_targets[BUILTIN_CMD_NUMBER];
     HTML_TARGET_LIST html_special_targets[ST_footnote_location+1];