[5914] disable convert_eols, compiler warnings

[Gavin D. Smith]

Revision: 5914
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5914
Author:   gavin
Date:     2014-11-07 11:42:42 +0000 (Fri, 07 Nov 2014)
Log Message:
-----------
disable convert_eols, compiler warnings

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/filesys.c
    trunk/info/pseudotty.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-11-07 11:29:29 UTC (rev 5913)
+++ trunk/ChangeLog     2014-11-07 11:42:42 UTC (rev 5914)
@@ -3,6 +3,11 @@
        * info/echo-area.c (ea_forward, ea_backward): Go forward and 
        backward over multi-byte characters correctly.
 
+       * info/filesys.c (convert_eols): Disable with preprocessor to 
+       avoid warning about unused function.
+       * info/pseudotty.c: Avoid compiler warnings about set but unused 
+       variable and include <error.h> to get prototype of 'error'.
+
 2014-11-07  Gavin Smith  <address@hidden>
 
        * info/session.c (info_dispatch_on_key, read_key_sequence):

Modified: trunk/info/filesys.c
===================================================================
--- trunk/info/filesys.c        2014-11-07 11:29:29 UTC (rev 5913)
+++ trunk/info/filesys.c        2014-11-07 11:42:42 UTC (rev 5914)
@@ -32,11 +32,6 @@
 
 static char *filesys_read_compressed (char *pathname, size_t *filesize);
 
-/* Given a chunk of text and its length, convert all CRLF pairs at the
-   EOLs into a single Newline character.  Return the length of produced
-   text.  */
-static long convert_eols (char *text, long textlen);
-
 /* Return the command string that would be used to decompress FILENAME. */
 static char *filesys_decompressor_for_file (char *filename);
 static int compressed_filename_p (char *filename);
@@ -275,6 +270,7 @@
   return 0;
 }
 
+#if 0
 /* Given a chunk of text and its length, convert all CRLF pairs at every
    end-of-line into a single Newline character.  Return the length of
    produced text.
@@ -308,6 +304,7 @@
 
   return d - text;
 }
+#endif
 
 /* Read the contents of PATHNAME, returning a buffer with the contents of
    that file in it, and returning the size of that buffer in FILESIZE.

Modified: trunk/info/pseudotty.c
===================================================================
--- trunk/info/pseudotty.c      2014-11-07 11:29:29 UTC (rev 5913)
+++ trunk/info/pseudotty.c      2014-11-07 11:42:42 UTC (rev 5914)
@@ -23,6 +23,7 @@
 
 #include <config.h>
 #include <errno.h>
+#include <error.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -61,12 +62,10 @@
   error (0, 0, "entering main loop");
   for (;;)
     {
-      int ret;
-
       FD_SET (master, &read_set);
       FD_SET (CONTROL, &read_set);
 
-      ret = select (FD_SETSIZE, &read_set, 0, 0, 0);
+      select (FD_SETSIZE, &read_set, 0, 0, 0);
       if (FD_ISSET (CONTROL, &read_set))
         {
           int c, success;