[5654] fix compiler warnings

[Gavin D. Smith]

Revision: 5654
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5654
Author:   gavin
Date:     2014-06-09 12:01:21 +0000 (Mon, 09 Jun 2014)
Log Message:
-----------
fix compiler warnings

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/dir.c
    trunk/info/infopath.c
    trunk/info/session.c
    trunk/info/session.h
    trunk/info/window.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-06-09 11:04:23 UTC (rev 5653)
+++ trunk/ChangeLog     2014-06-09 12:01:21 UTC (rev 5654)
@@ -1,5 +1,16 @@
 2014-06-09  Gavin Smith  <address@hidden>
 
+       * info/dir.c (dir_entry_of_infodir): Return null if nothing found.
+       * info/window.h (WINDOW): Declare hist_index, hist_slots with size_t
+       instead of int.
+       * info/session.h: Add declaration of forget_window_and_nodes
+       and forget_node.
+       * info/infopath.c (build_infopath_from_path): Remove unused variable.
+       * info/session.c (point_backward_word, info_next_line, info_prev_line)
+       (kill_node): Remove unused local variables.
+
+2014-06-09  Gavin Smith  <address@hidden>
+
        * doc/info-stnd.texi (Variables) <scroll-step>: Updated to state
        that the default value is 1 (changed in 4.12 release).
 

Modified: trunk/info/dir.c
===================================================================
--- trunk/info/dir.c    2014-06-09 11:04:23 UTC (rev 5653)
+++ trunk/info/dir.c    2014-06-09 12:01:21 UTC (rev 5654)
@@ -297,6 +297,7 @@
         }
       return entry;
     }
+  return 0;
 }
 
 

Modified: trunk/info/infopath.c
===================================================================
--- trunk/info/infopath.c       2014-06-09 11:04:23 UTC (rev 5653)
+++ trunk/info/infopath.c       2014-06-09 12:01:21 UTC (rev 5654)
@@ -108,7 +108,7 @@
 static void
 build_infopath_from_path (void)
 {
-  char *res, *path_from_env, *temp_dirname;
+  char *path_from_env, *temp_dirname;
   int dirname_index = 0;
   struct stat finfo;
 

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-06-09 11:04:23 UTC (rev 5653)
+++ trunk/info/session.c        2014-06-09 12:01:21 UTC (rev 5654)
@@ -66,8 +66,6 @@
 /* Minimal length of a search string */
 int min_search_length = 1;
 
-void forget_window_and_nodes (WINDOW *window);
-
 /* Begin an info session finding the nodes specified by REFERENCES.  For
    each loaded node, create a new window.  Always split the largest of the
    available windows.  Display ERROR in echo area if non-null. */
@@ -603,8 +601,6 @@
 
   while (1)
     {
-      long point;
-
       for (; col >= 0; col--)
        {
           win->point = win->line_map.map[col];
@@ -631,8 +627,6 @@
 /* Move WINDOW's point down to the next line if possible. */
 DECLARE_INFO_COMMAND (info_next_line, _("Move down to the next line"))
 {
-  int old_line, new_line;
-
   if (count < 0)
     info_prev_line (window, -count, key);
   else
@@ -649,8 +643,6 @@
 /* Move WINDOW's point up to the previous line if possible. */
 DECLARE_INFO_COMMAND (info_prev_line, _("Move up to the previous line"))
 {
-  int old_line, new_line;
-
   if (count < 0)
     info_next_line (window, -count, key);
   else
@@ -2790,8 +2782,6 @@
 static void
 kill_node (WINDOW *window, char *nodename)
 {
-  int iw, i;
-  NODE *temp;
   WINDOW *info_win = window;
 
   /* If there is no nodename to kill, quit now. */

Modified: trunk/info/session.h
===================================================================
--- trunk/info/session.h        2014-06-09 11:04:23 UTC (rev 5653)
+++ trunk/info/session.h        2014-06-09 12:01:21 UTC (rev 5654)
@@ -102,6 +102,9 @@
    associated nodes. */
 extern void info_delete_window_internal (WINDOW *window);
 
+extern void forget_window_and_nodes (WINDOW *window);
+extern void forget_node (WINDOW *win);
+
 /* Tell Info that input is coming from the file FILENAME. */
 extern void info_set_input_from_file (char *filename);
 

Modified: trunk/info/window.h
===================================================================
--- trunk/info/window.h 2014-06-09 11:04:23 UTC (rev 5653)
+++ trunk/info/window.h 2014-06-09 12:01:21 UTC (rev 5654)
@@ -90,8 +90,8 @@
 
   /* History of nodes visited in this window. */
   WINDOW_STATE **hist;       /* Nodes visited in this window. */
-  int hist_index;            /* Index where to add the next node. */
-  int hist_slots;            /* Number of slots allocated to HIST. */
+  size_t hist_index;            /* Index where to add the next node. */
+  size_t hist_slots;            /* Number of slots allocated to HIST. */
 } WINDOW;
 
 /* Structure defining the current state of an incremental search. */