[5779] fix some compiler warnings

[Gavin D. Smith]

Revision: 5779
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5779
Author:   gavin
Date:     2014-08-25 16:02:23 +0000 (Mon, 25 Aug 2014)
Log Message:
-----------
fix some compiler warnings

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-08-25 15:18:26 UTC (rev 5778)
+++ trunk/ChangeLog     2014-08-25 16:02:23 UTC (rev 5779)
@@ -1,5 +1,14 @@
 2014-08-25  Gavin Smith  <address@hidden>
 
+       * info/display.c (find_diff): Add braces round "if" command.
+       (display_update_window_1): Remove unused variable.
+       * info/session.c (isearch_terminate_search_key): Removed.
+       * info/session.h: Add missing declarations for get_input_key,
+       get_another_input_key.
+       * info/session.c (fill_input_buffer): Remove unused variable.
+
+2014-08-25  Gavin Smith  <address@hidden>
+
        * info/window.c (set_window_pagetop): If point would end up past
        bottom of displayed part of node, put it on the last displayed line.
 

Modified: trunk/info/display.c
===================================================================
--- trunk/info/display.c        2014-08-25 15:18:26 UTC (rev 5778)
+++ trunk/info/display.c        2014-08-25 16:02:23 UTC (rev 5779)
@@ -123,19 +123,21 @@
     }
 
   if (mbi_avail (itra) || mbi_avail (itrb))
-    if (first_escape != -1)
-      {
-        *ppos = escape_pos;
-        return first_escape;
-      }
-    else
-      {
-        /* If there was a difference in the line, and there was an escape
-           character, return the position of the escape character, as it could
-           start a terminal escape sequence. */
-        *ppos = pos;
-        return i;
-      }
+    {
+      if (first_escape != -1)
+        {
+          *ppos = escape_pos;
+          return first_escape;
+        }
+      else
+        {
+          /* If there was a difference in the line, and there was an escape
+             character, return the position of the escape character, as it 
could
+             start a terminal escape sequence. */
+          *ppos = pos;
+          return i;
+        }
+    }
 
   /* Otherwise, no redrawing is required. */
   return -1;
@@ -381,8 +383,6 @@
 
       if (*cur_ptr != '\n' && rep) 
         {
-          int i;
-          
           text_buffer_add_string (&tb_printed_line, rep, pbytes);
           pl_chars += pchars;
           continue;

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-08-25 15:18:26 UTC (rev 5778)
+++ trunk/info/session.c        2014-08-25 16:02:23 UTC (rev 5779)
@@ -396,10 +396,8 @@
          --restore, switch to standard input.  Otherwise quit. */
       if (info_input_stream != stdin)
         {
-          int tty;
           fclose (info_input_stream);
           info_input_stream = stdin;
-          tty = fileno (info_input_stream);
           display_inhibited = 0;
           display_update_display ();
           display_cursor_at_point (active_window);
@@ -4026,7 +4024,6 @@
 static char *isearch_string = NULL;
 static int isearch_string_index = 0;
 static int isearch_string_size = 0;
-static unsigned char isearch_terminate_search_key = ESC;
 
 /* Array of search states. */
 static SEARCH_STATE **isearch_states = NULL;

Modified: trunk/info/session.h
===================================================================
--- trunk/info/session.h        2014-08-25 15:18:26 UTC (rev 5778)
+++ trunk/info/session.h        2014-08-25 16:02:23 UTC (rev 5779)
@@ -68,6 +68,9 @@
 #define SLN_Scroll 1 /* Do usual scrolling */
 #define SLN_Top    2 /* Go to the top node */
 
+int get_input_key (void);
+int get_another_input_key (void);
+
 extern char *scroll_last_node_choices[];
 /* Controls what to do when a scrolling command is issued at the end of the
    last node. */