[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Sun, 29 Sep 2024 08:53:21 -0400 (EDT) |
branch: master
commit 8093bc399cd604887c47899fb3df3cdd3a41e094
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Jun 27 00:50:30 2024 +0200
Add some const
---
ChangeLog | 4 ++
tp/Texinfo/XS/convert/convert_html.c | 14 ++---
tp/Texinfo/XS/main/manipulate_tree.c | 2 +-
tp/Texinfo/XS/main/manipulate_tree.h | 2 +-
tp/Texinfo/XS/structuring_transfo/structuring.c | 68 ++++++++++++-------------
5 files changed, 47 insertions(+), 43 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 49c1b8481e..2f743b9fa1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2024-06-26 Patrice Dumas <pertusus@free.fr>
+
+ Add some const
+
2024-06-26 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/main/tree_types.h (OUTPUT_UNIT): use a union for
diff --git a/tp/Texinfo/XS/convert/convert_html.c
b/tp/Texinfo/XS/convert/convert_html.c
index 0215ae907b..f7ec24fdcb 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -12437,8 +12437,8 @@ convert_xref_commands (CONVERTER *self, const enum
command_id cmd,
/* check for internal reference */
if (cmd != CM_inforef && !book && !file && arg_node)
{
- char *normalized = lookup_extra_string (arg_node, AI_key_normalized);
- ELEMENT *manual_content = lookup_extra_element (arg_node,
+ const char *normalized = lookup_extra_string (arg_node,
AI_key_normalized);
+ const ELEMENT *manual_content = lookup_extra_element (arg_node,
AI_key_manual_content);
if (normalized && !manual_content)
{
@@ -13130,8 +13130,8 @@ convert_printindex_command (CONVERTER *self, const enum
command_id cmd,
char *multiple_pass_str;
size_t entry_index_nr;
const INDEX *entry_index;
- ELEMENT *seeentry;
- ELEMENT *seealso;
+ const ELEMENT *seeentry;
+ const ELEMENT *seealso;
char *new_normalized_entry_levels[SUBENTRIES_MAX_LEVEL +1];
ELEMENT *entry_trees[SUBENTRIES_MAX_LEVEL +1];
int last_entry_level;
@@ -13140,7 +13140,7 @@ convert_printindex_command (CONVERTER *self, const enum
command_id cmd,
const ELEMENT *associated_command = 0;
char *entry_href;
ELEMENT *entry_tree;
- ELEMENT *subentry;
+ const ELEMENT *subentry;
ELEMENT_LIST *other_subentries_tree = 0;
int subentry_level = 1;
ELEMENT *entry_content_element;
@@ -13214,7 +13214,7 @@ convert_printindex_command (CONVERTER *self, const enum
command_id cmd,
while (subentry_level <= SUBENTRIES_MAX_LEVEL)
{
- ELEMENT *new_subentry = lookup_extra_element (subentry,
+ const ELEMENT *new_subentry = lookup_extra_element (subentry,
AI_key_subentry);
ELEMENT *subentry_tree = 0;
if (!new_subentry)
@@ -13351,7 +13351,7 @@ convert_printindex_command (CONVERTER *self, const enum
command_id cmd,
NAMED_STRING_ELEMENT_LIST *substrings
= new_named_string_element_list ();
ELEMENT *referred_tree;
- ELEMENT *referred_entry;
+ const ELEMENT *referred_entry;
char *entry;
char *reference = 0;
diff --git a/tp/Texinfo/XS/main/manipulate_tree.c
b/tp/Texinfo/XS/main/manipulate_tree.c
index 2d61ade264..ad7e8489aa 100644
--- a/tp/Texinfo/XS/main/manipulate_tree.c
+++ b/tp/Texinfo/XS/main/manipulate_tree.c
@@ -340,7 +340,7 @@ copy_tree (ELEMENT *current)
}
ELEMENT *
-copy_contents (ELEMENT *element, enum element_type type)
+copy_contents (const ELEMENT *element, enum element_type type)
{
ELEMENT *tmp = new_element (type);
ELEMENT *result;
diff --git a/tp/Texinfo/XS/main/manipulate_tree.h
b/tp/Texinfo/XS/main/manipulate_tree.h
index 368bf6bfe9..6da672e8be 100644
--- a/tp/Texinfo/XS/main/manipulate_tree.h
+++ b/tp/Texinfo/XS/main/manipulate_tree.h
@@ -22,7 +22,7 @@
#include "tree_types.h"
ELEMENT *copy_tree (ELEMENT *current);
-ELEMENT *copy_contents (ELEMENT *element, enum element_type type);
+ELEMENT *copy_contents (const ELEMENT *element, enum element_type type);
diff --git a/tp/Texinfo/XS/structuring_transfo/structuring.c
b/tp/Texinfo/XS/structuring_transfo/structuring.c
index c62ad3bd29..51a2f5d511 100644
--- a/tp/Texinfo/XS/structuring_transfo/structuring.c
+++ b/tp/Texinfo/XS/structuring_transfo/structuring.c
@@ -411,17 +411,17 @@ warn_non_empty_parts (DOCUMENT *document)
void
check_menu_entry (DOCUMENT *document, enum command_id cmd,
- ELEMENT *menu_content, ELEMENT *menu_entry_node)
+ const ELEMENT *menu_content, const ELEMENT *menu_entry_node)
{
ERROR_MESSAGE_LIST *error_messages = &document->error_messages;
LABEL_LIST *identifiers_target = &document->identifiers_target;
OPTIONS *options = document->options;
- char *normalized_menu_node = lookup_extra_string (menu_entry_node,
+ const char *normalized_menu_node = lookup_extra_string (menu_entry_node,
AI_key_normalized);
if (normalized_menu_node)
{
- ELEMENT *menu_node = find_identifier_target (identifiers_target,
+ const ELEMENT *menu_node = find_identifier_target (identifiers_target,
normalized_menu_node);
if (!menu_node)
{
@@ -434,7 +434,7 @@ check_menu_entry (DOCUMENT *document, enum command_id cmd,
else
{
const ELEMENT *node_content = lookup_extra_element (menu_entry_node,
- AI_key_node_content);
+ AI_key_node_content);
if (!check_node_same_texinfo_code (menu_node, node_content))
{
char *entry_node_texi = link_element_to_texi (menu_entry_node);
@@ -498,7 +498,7 @@ get_node_node_childs_from_sectioning (const ELEMENT *node)
int i;
for (i = 0; i < section_childs->number; i++)
{
- ELEMENT *child = section_childs->list[i];
+ const ELEMENT *child = section_childs->list[i];
ELEMENT *associated_node
= lookup_extra_element (child,
AI_key_associated_node);
@@ -864,7 +864,7 @@ set_menus_node_directions (DOCUMENT *document)
ELEMENT *content = menu_content->e.c->contents.list[l];
if (content->type == ET_menu_entry_node)
{
- ELEMENT *manual_content
+ const ELEMENT *manual_content
= lookup_extra_element (content,
AI_key_manual_content);
@@ -873,7 +873,7 @@ set_menus_node_directions (DOCUMENT *document)
if (check_menu_entries)
check_menu_entry (document, menu->e.c->cmd,
menu_content, content);
- char *normalized
+ const char *normalized
= lookup_extra_string (content,
AI_key_normalized);
if (normalized)
@@ -901,10 +901,10 @@ set_menus_node_directions (DOCUMENT *document)
{
if (previous_node)
{
- ELEMENT *manual_content
+ const ELEMENT *manual_content
= lookup_extra_element (menu_node,
AI_key_manual_content);
- ELEMENT *prev_manual_content
+ const ELEMENT *prev_manual_content
= lookup_extra_element (previous_node,
AI_key_manual_content);
if (!manual_content)
@@ -939,16 +939,16 @@ set_menus_node_directions (DOCUMENT *document)
int k;
for (k = 0; k < detailmenu->e.c->contents.number; k++)
{
- ELEMENT *menu_content = detailmenu->e.c->contents.list[k];
+ const ELEMENT *menu_content = detailmenu->e.c->contents.list[k];
if (menu_content->type == ET_menu_entry)
{
int l;
for (l = 0; l < menu_content->e.c->contents.number; l++)
{
- ELEMENT *content = menu_content->e.c->contents.list[l];
+ const ELEMENT *content =
menu_content->e.c->contents.list[l];
if (content->type == ET_menu_entry_node)
{
- ELEMENT *manual_content
+ const ELEMENT *manual_content
= lookup_extra_element (content,
AI_key_manual_content);
@@ -1032,7 +1032,7 @@ complete_node_tree_with_menus (DOCUMENT *document)
int d;
for (d = 0; d < directions_length; d++)
{
- ELEMENT *section;
+ const ELEMENT *section;
/* prev already defined for the node first Top node menu entry */
if (d == D_prev)
{
@@ -1216,12 +1216,12 @@ complete_node_tree_with_menus (DOCUMENT *document)
&& node_directions->list[d]
!= menu_directions->list[d])
{
- ELEMENT *menu_direction
+ const ELEMENT *menu_direction
= menu_directions->list[d];
- ELEMENT *menu_dir_manual_content
+ const ELEMENT *menu_dir_manual_content
= lookup_extra_element (menu_direction,
AI_key_manual_content);
- ELEMENT *node_dir_manual_content
+ const ELEMENT *node_dir_manual_content
= lookup_extra_element (node_directions->list[d],
AI_key_manual_content);
if (!menu_dir_manual_content && !node_dir_manual_content)
@@ -1256,10 +1256,10 @@ complete_node_tree_with_menus (DOCUMENT *document)
up_node = node_directions->list[D_up];
if (up_node)
{
- ELEMENT *manual_content = lookup_extra_element (up_node,
+ const ELEMENT *manual_content = lookup_extra_element (up_node,
AI_key_manual_content);
int is_target = (node->flags & EF_is_target);
- ELEMENT_LIST *menus
+ const ELEMENT_LIST *menus
= lookup_extra_contents (up_node, AI_key_menus);
/* No check if node up is an external manual */
@@ -1274,14 +1274,14 @@ complete_node_tree_with_menus (DOCUMENT *document)
int found = 0;
for (j = 0; j < menus->number; j++)
{
- ELEMENT *menu = menus->list[j];
+ const ELEMENT *menu = menus->list[j];
int k;
for (k = 0; k < menu->e.c->contents.number; k++)
{
- ELEMENT *menu_content = menu->e.c->contents.list[k];
+ const ELEMENT *menu_content =
menu->e.c->contents.list[k];
if (menu_content->type == ET_menu_entry)
{
- ELEMENT *menu_node
+ const ELEMENT *menu_node
= normalized_entry_associated_internal_node (
menu_content,
identifiers_target);
@@ -1362,8 +1362,8 @@ nodes_tree (DOCUMENT *document)
if (d == D_prev && node_directions
&& node_directions->list[d])
{
- ELEMENT *prev_element = node_directions->list[d];
- char *prev_normalized
+ const ELEMENT *prev_element = node_directions->list[d];
+ const char *prev_normalized
= lookup_extra_string (prev_element, AI_key_normalized);
if (prev_normalized)
{
@@ -1394,15 +1394,15 @@ nodes_tree (DOCUMENT *document)
}
else /* Special case for Top node, use first section */
{
- ELEMENT *section
+ const ELEMENT *section
= lookup_extra_element (node, AI_key_associated_section);
if (section)
{
- ELEMENT_LIST *section_childs
+ const ELEMENT_LIST *section_childs
= lookup_extra_contents (section, AI_key_section_childs);
if (section_childs && section_childs->number > 0)
{
- ELEMENT *first_sec = section_childs->list[0];
+ const ELEMENT *first_sec = section_childs->list[0];
ELEMENT *top_node_section_child
= lookup_extra_element (first_sec,
AI_key_associated_node);
@@ -1709,7 +1709,7 @@ new_node_menu_entry (const ELEMENT *node, int
use_sections)
{
int i;
ELEMENT *name_element;
- ELEMENT *associated_section
+ const ELEMENT *associated_section
= lookup_extra_element (node, AI_key_associated_section);
if (associated_section)
name_element = associated_section->e.c->args.list[0];
@@ -1881,9 +1881,9 @@ new_complete_node_menu (const ELEMENT *node, DOCUMENT
*document,
int in_appendix = 0;
for (i = 0; i < node_childs->number; i++)
{
- ELEMENT *child = node_childs->list[i];
+ const ELEMENT *child = node_childs->list[i];
int is_target = (child->flags & EF_is_target);
- ELEMENT *child_section;
+ const ELEMENT *child_section;
if (!is_target)
continue;
@@ -1893,7 +1893,7 @@ new_complete_node_menu (const ELEMENT *node, DOCUMENT
*document,
if (child_section)
{
int part_added = 0;
- ELEMENT *associated_part
+ const ELEMENT *associated_part
= lookup_extra_element (child_section,
AI_key_associated_part);
if (associated_part
@@ -2013,9 +2013,9 @@ print_down_menus (const ELEMENT *node, ELEMENT_STACK
*up_nodes,
if (master_menu_contents->number > 0)
{
- ELEMENT *node_name_element;
+ const ELEMENT *node_name_element;
ELEMENT *node_title_copy;
- ELEMENT *associated_section
+ const ELEMENT *associated_section
= lookup_extra_element (node, AI_key_associated_section);
int new_up_nodes = 0;
if (associated_section)
@@ -2201,8 +2201,8 @@ new_complete_menu_master_menu (ERROR_MESSAGE_LIST
*error_messages,
if (menu_node)
{
- char *normalized = lookup_extra_string (node, AI_key_normalized);
- ELEMENT *associated_section
+ const char *normalized = lookup_extra_string (node, AI_key_normalized);
+ const ELEMENT *associated_section
= lookup_extra_element (node, AI_key_associated_section);
if (normalized && !strcmp (normalized, "Top")
&& associated_section && associated_section->e.c->cmd == CM_top)