[5737] resbnd consistent naming

[Gavin D. Smith]

Revision: 5737
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5737
Author:   gavin
Date:     2014-08-08 12:22:09 +0000 (Fri, 08 Aug 2014)
Log Message:
-----------
resbnd consistent naming

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-08-08 10:45:18 UTC (rev 5736)
+++ trunk/ChangeLog     2014-08-08 12:22:09 UTC (rev 5737)
@@ -1,5 +1,12 @@
 2014-08-08  Gavin Smith  <address@hidden>
 
+       * info/session.c (match_in_match_list, info_search_1)
+       (incremental_search)
+       Consistently name 'resbnd' arguments and local variables which are
+       SEARCH_BINDING's giving the result of a search.
+
+2014-08-08  Gavin Smith  <address@hidden>
+
        * info/infomap.c (default_emacs_like_info_keys): Display RET, PgUp,
        PgDown in help message.
        * info/info.c (info_short_help): Say to show key bindings with "H"

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-08-08 10:45:18 UTC (rev 5736)
+++ trunk/info/session.c        2014-08-08 12:22:09 UTC (rev 5737)
@@ -3455,12 +3455,12 @@
    delimited by BINDING. The search is forwards if BINDING->start is greater
    than BINDING->end.
 
-   If PEND is specified, it receives a copy of BINDING at the end of a
+   If RESBND is specified, it receives a copy of BINDING at the end of a
    succeded search.  Its START and END fields contain bounds of the found
    string instance. */
 static enum search_result
 match_in_match_list (WINDOW *window, SEARCH_BINDING *binding,
-                     long *poff, SEARCH_BINDING *pend)
+                     long *poff, SEARCH_BINDING *resbnd)
 {
   regoff_t start = 0, end;
   regmatch_t *matches; /* List of matches. */
@@ -3493,12 +3493,12 @@
 
           if (matches[i].rm_so < end)
            {
-             if (pend)
+             if (resbnd)
                {
-                 pend->buffer = binding->buffer;
-                 pend->flags = binding->flags;
-                 pend->start = matches[i].rm_so;
-                 pend->end = matches[i].rm_eo;
+                 resbnd->buffer = binding->buffer;
+                 resbnd->flags = binding->flags;
+                 resbnd->start = matches[i].rm_so;
+                 resbnd->end = matches[i].rm_eo;
                }
              *poff = matches[i].rm_so;
              return search_success;
@@ -3516,12 +3516,12 @@
 
           if (matches[i].rm_so >= start)
             {
-             if (pend)
+             if (resbnd)
                {
-                 pend->buffer = binding->buffer;
-                 pend->flags = binding->flags;
-                 pend->start = matches[i].rm_so;
-                 pend->end = matches[i].rm_eo;
+                 resbnd->buffer = binding->buffer;
+                 resbnd->flags = binding->flags;
+                 resbnd->start = matches[i].rm_so;
+                 resbnd->end = matches[i].rm_eo;
                }
               if (binding->flags & S_SkipDest)
                 *poff = matches[i].rm_eo;
@@ -3920,14 +3920,14 @@
   char *line, *prompt;
   int result, old_pagetop;
   int direction;
-  SEARCH_BINDING bind, *bindp;
+  SEARCH_BINDING bind, *resbnd;
 
   if (start == DFL_START)
-    bindp = NULL;
+    resbnd = NULL;
   else
     {
       bind.start = start;
-      bindp = &bind;
+      resbnd = &bind;
     }
   
   if (count < 0)
@@ -4004,7 +4004,7 @@
   for (result = 0; result == 0 && count--; )
     result = info_search_internal (search_string,
                                    active_window, direction, case_sensitive,
-                                  bindp);
+                                  resbnd);
 
   if (result == 0 && old_pagetop != active_window->pagetop)
     {
@@ -4210,9 +4210,9 @@
   SEARCH_STATE mystate, orig_state;
   char *p;
   int case_sensitive = 0;
-  SEARCH_BINDING bnd;
+  SEARCH_BINDING resbnd;
 
-  bnd.start = -1;
+  resbnd.start = -1;
 
   if (count < 0)
     dir = -1;
@@ -4343,7 +4343,7 @@
                       if (search_result == 0)
                        {
                          window->point += dir;
-                         bnd.start = -1;
+                         resbnd.start = -1;
                        }
                     }
                 }
@@ -4421,7 +4421,7 @@
         {
           search_result = info_search_internal (isearch_string,
                                                 window, dir, case_sensitive,
-                                               &bnd);
+                                               &resbnd);
         }
       else if (search_result == 0)
         { /* We test for search_result being zero because a non-zero