[no subject]

[Patrice Dumas]

branch: master
commit a81188f71aed73b236d7d514515a277427d9a8b3
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jun 16 14:18:04 2024 +0200

    * tp/Texinfo/XS/main/command_stack.c
    (command_is_in_referred_command_stack): add braces for better code
    readability.
    
    * tp/Texinfo/XS/main/convert_utils.c (encoded_input_file_name)
    (encoded_output_file_name): simpler conditions.
---
 ChangeLog                          | 9 +++++++++
 tp/Texinfo/XS/main/command_stack.c | 4 ++--
 tp/Texinfo/XS/main/convert_utils.c | 8 ++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd6ee7f08e..1339860382 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,15 @@
        * tp/Texinfo/XS/convert/convert_html.c (html_command_description):
        update for move of cmd to CONTAINER.
 
+2024-06-16  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/main/command_stack.c
+       (command_is_in_referred_command_stack): add braces for better code
+       readability.
+
+       * tp/Texinfo/XS/main/convert_utils.c (encoded_input_file_name)
+       (encoded_output_file_name): simpler conditions.
+
 2024-06-16  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/converter.c (xml_numeric_entity_accent):
diff --git a/tp/Texinfo/XS/main/command_stack.c 
b/tp/Texinfo/XS/main/command_stack.c
index cd60a01480..79af1e086d 100644
--- a/tp/Texinfo/XS/main/command_stack.c
+++ b/tp/Texinfo/XS/main/command_stack.c
@@ -259,8 +259,8 @@ command_is_in_referred_command_stack (const 
ELEMENT_REFERENCE_STACK *stack,
   for (i = 0; i < stack->top; i++)
     {
       ELEMENT_REFERENCE *element_reference = &stack->stack[i];
-      if (e && element_reference->element == e
-          || hv && element_reference->hv == hv)
+      if ((e && element_reference->element == e)
+          || (hv && element_reference->hv == hv))
         {
           return 1;
         }
diff --git a/tp/Texinfo/XS/main/convert_utils.c 
b/tp/Texinfo/XS/main/convert_utils.c
index 58b506efb9..a339254459 100644
--- a/tp/Texinfo/XS/main/convert_utils.c
+++ b/tp/Texinfo/XS/main/convert_utils.c
@@ -300,8 +300,8 @@ encoded_input_file_name (const OPTIONS *options,
 
   if (options && options->INPUT_FILE_NAME_ENCODING.o.string)
     encoding = options->INPUT_FILE_NAME_ENCODING.o.string;
-  else if (options && options->DOC_ENCODING_FOR_INPUT_FILE_NAME.o.integer != 0
-           || (!options))
+  else if (!options
+           || options->DOC_ENCODING_FOR_INPUT_FILE_NAME.o.integer != 0)
     {
       if (input_file_encoding)
         encoding = input_file_encoding;
@@ -334,8 +334,8 @@ encoded_output_file_name (const OPTIONS *options,
 
   if (options && options->OUTPUT_FILE_NAME_ENCODING.o.string)
     encoding = options->OUTPUT_FILE_NAME_ENCODING.o.string;
-  else if (options && options->DOC_ENCODING_FOR_OUTPUT_FILE_NAME.o.integer != 0
-           || (!options))
+  else if (!options
+           || options->DOC_ENCODING_FOR_OUTPUT_FILE_NAME.o.integer != 0)
     {
       if (global_information && global_information->input_encoding_name)
         encoding = global_information->input_encoding_name;