This commit was generated by cvs2svn to track changes on a CVS vendor

[unix-history] / gnu / usr.bin / gzip / unpack.c

diff --git a/gnu/usr.bin/gzip/unpack.c b/gnu/usr.bin/gzip/unpack.c
index 789cbc0..a00fdae 100644 (file)
--- a/gnu/usr.bin/gzip/unpack.c
+++ b/gnu/usr.bin/gzip/unpack.c
@@ -4,7 +4,7 @@
  * terms of the GNU General Public License, see the file COPYING.
  */
 
  * terms of the GNU General Public License, see the file COPYING.
  */
 

-#ifndef lint
+#ifdef RCSID

 static char rcsid[] = "$Id: unpack.c,v 1.4 1993/06/11 19:25:36 jloup Exp $";
 #endif
 
 static char rcsid[] = "$Id: unpack.c,v 1.4 1993/06/11 19:25:36 jloup Exp $";
 #endif
 


@@ -57,7 +57,7 @@ local int peek_bits; /* Number of peek bits currently used */
  * codes encountered in the input stream are short codes (by construction).
  * So for most codes a single lookup will be necessary.
  */
  * codes encountered in the input stream are short codes (by construction).
  * So for most codes a single lookup will be necessary.
  */

-#if 1<<MAX_PEEK > OUTBUFSIZ
+#if (1<<MAX_PEEK) > OUTBUFSIZ

     error cannot overlay prefix_len and outbuf
 #endif
 
     error cannot overlay prefix_len and outbuf
 #endif
 


@@ -219,7 +219,7 @@ int unpack(in, out)
            do {
                 len++, mask = (mask<<1)+1;
                look_bits(peek, len, mask);
            do {
                 len++, mask = (mask<<1)+1;
                look_bits(peek, len, mask);

-           } while (peek < parents[len]);
+           } while (peek < (unsigned)parents[len]);

            /* loop as long as peek is a parent node */
        }
        /* At this point, peek is the next complete code, of len bits */
            /* loop as long as peek is a parent node */
        }
        /* At this point, peek is the next complete code, of len bits */


@@ -232,7 +232,7 @@ int unpack(in, out)
 
     flush_window();
     Trace((stderr, "bytes_out %ld\n", bytes_out));
 
     flush_window();
     Trace((stderr, "bytes_out %ld\n", bytes_out));

-    if (orig_len != bytes_out) {
+    if (orig_len != (ulg)bytes_out) {

        error("invalid compressed data--length error");
     }
     return OK;
        error("invalid compressed data--length error");
     }
     return OK;