[5723] info_search_in_node merged into caller

[Gavin D. Smith]

Revision: 5723
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5723
Author:   gavin
Date:     2014-07-27 10:32:33 +0000 (Sun, 27 Jul 2014)
Log Message:
-----------
info_search_in_node merged into caller

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/footnotes.c
    trunk/info/session.c
    trunk/info/session.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-07-27 10:03:34 UTC (rev 5722)
+++ trunk/ChangeLog     2014-07-27 10:32:33 UTC (rev 5723)
@@ -1,7 +1,7 @@
 2014-07-27  Gavin Smith  <address@hidden>
 
-       * info/session.c (info_search_in_node): Merged into caller in
-       info_target_search_node.
+       * info/session.c (info_search_in_node): Merged into callers in
+       info_target_search_node and make_footnotes_node.
 
 2014-07-26  Gavin Smith  <address@hidden>
 

Modified: trunk/info/footnotes.c
===================================================================
--- trunk/info/footnotes.c      2014-07-27 10:03:34 UTC (rev 5722)
+++ trunk/info/footnotes.c      2014-07-27 10:32:33 UTC (rev 5723)
@@ -53,17 +53,19 @@
 make_footnotes_node (NODE *node)
 {
   NODE *fn_node, *footnotes_node = NULL, *result = NULL;
-  long fn_start;
+  long fn_start = -1;
+  enum search_result ret;
 
   /* Make the initial assumption that the footnotes appear as simple
      text within this windows node. */
   fn_node = node;
 
   /* See if this node contains the magic footnote label. */
-  fn_start = info_search_in_node (FOOTNOTE_LABEL, node, 0, NULL, 1, 0, 0);
-
+  ret = info_search_in_node_internal (FOOTNOTE_LABEL, node, 0,
+                                   NULL, 1, 0, 0, 0,
+                                   &fn_start, NULL);
   /* If it doesn't, check to see if it has an associated footnotes node. */
-  if (fn_start == -1)
+  if (ret != search_success)
     {
       REFERENCE **refs;
 

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-07-27 10:03:34 UTC (rev 5722)
+++ trunk/info/session.c        2014-07-27 10:32:33 UTC (rev 5723)
@@ -3431,7 +3431,7 @@
    of the search binding.  In particular, its START and END fields contain
    bounds of the found string instance.
 */
-static enum search_result
+enum search_result
 info_search_in_node_internal (char *string, NODE *node, long int start,
                              WINDOW *window, int dir, int case_sensitive,
                              int match_nodename, int match_regexp,

Modified: trunk/info/session.h
===================================================================
--- trunk/info/session.h        2014-07-27 10:03:34 UTC (rev 5722)
+++ trunk/info/session.h        2014-07-27 10:32:33 UTC (rev 5723)
@@ -80,6 +80,9 @@
 extern void initialize_keyseq (void);
 extern void add_char_to_keyseq (int character);
 extern FILE_BUFFER *file_buffer_of_window (WINDOW *window);
+enum search_result info_search_in_node_internal (char *string, NODE *node,
+    long int start, WINDOW *window, int dir, int case_sensitive,
+    int match_nodename, int match_regexp, long *poff, SEARCH_BINDING *resbnd);
 extern long info_target_search_node (NODE *node, char *string,
     long int start, int use_regexp_mask);
 extern int info_select_reference (WINDOW *window, REFERENCE *entry);