branch master updated: * info/nodes.c (info_node_of_tag_ext): call adjust_nodestart directly, as if nodelen is > 0 nodestart_adjusted is necessarily set, while if nodelen is 0, nodestart_adjusted is not set.

[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 424c5f08ad * info/nodes.c (info_node_of_tag_ext): call 
adjust_nodestart directly, as if nodelen is > 0 nodestart_adjusted is 
necessarily set, while if nodelen is 0, nodestart_adjusted is not set.
424c5f08ad is described below

commit 424c5f08adfeb066dcb125047713df52b404b333
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Oct 12 20:47:52 2024 +0200

    * info/nodes.c (info_node_of_tag_ext): call adjust_nodestart directly,
    as if nodelen is > 0 nodestart_adjusted is necessarily set, while if
    nodelen is 0, nodestart_adjusted is not set.
---
 ChangeLog    |  6 ++++++
 info/nodes.c | 22 +++-------------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 070ab159c1..5eb47e1d96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-10-12  Patrice Dumas  <pertusus@free.fr>
+
+       * info/nodes.c (info_node_of_tag_ext): call adjust_nodestart directly,
+       as if nodelen is > 0 nodestart_adjusted is necessarily set, while if
+       nodelen is 0, nodestart_adjusted is not set.
+
 2024-10-12  Patrice Dumas  <pertusus@free.fr>
 
        * info/nodes.c (find_node_from_tag, info_node_of_tag_ext): remove
diff --git a/info/nodes.c b/info/nodes.c
index 299473032f..8cf1564822 100644
--- a/info/nodes.c
+++ b/info/nodes.c
@@ -1167,24 +1167,6 @@ adjust_nodestart (FILE_BUFFER *fb, TAG *node)
   return 1;
 }
 
-/* Look in the contents of *FB for a node referred to with TAG.  Set
-   the location if found in TAG->nodestart_adjusted.
- */
-static int
-find_node_from_tag (FILE_BUFFER *fb, TAG *tag)
-{
-  int success;
-
-  if (tag->nodestart_adjusted != -1)
-    success = 1;
-  else
-    success = adjust_nodestart (fb, tag);
-
-  if (success)
-    return success;
-  return 0;
-}
-
 /* Calculate the length of the node. */
 static void
 set_tag_nodelen (FILE_BUFFER *subfile, TAG *tag)
@@ -1276,7 +1258,9 @@ info_node_of_tag_ext (FILE_BUFFER *fb, TAG 
**input_tag_ptr, int fast)
      around about it and adjust it if necessary. */
   if (node_tag->cache.nodelen == 0)
     {
-      if (!find_node_from_tag (subfile, node_tag))
+      /* Set the location of node_tag in subfile in
+         node_tag->nodestart_adjusted if found. */
+      if (!adjust_nodestart (subfile, node_tag))
         return NULL; /* Node not found. */
 
       set_tag_nodelen (subfile, node_tag);