natInflater.cc (inflate): Cast `len' to unsigned.

	* java/util/zip/natInflater.cc (inflate): Cast `len' to unsigned.
	Include <stdlib.h>.
	* java/util/zip/natDeflater.cc (deflate): Cast `len' to unsigned.
	Include <stdlib.h>.
	(update): Fail in default case.  Always initialize `strat'.

From-SVN: r27028

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 181b437f10c33c3c526969f81e05a2ece1a6f897..52cd8c542dd9f703075d3ad565b7b5af239cba7e 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,11 @@
 1999-05-19  Tom Tromey  <tromey@cygnus.com>
 
+       * java/util/zip/natInflater.cc (inflate): Cast `len' to unsigned.
+       Include <stdlib.h>.
+       * java/util/zip/natDeflater.cc (deflate): Cast `len' to unsigned.
+       Include <stdlib.h>.
+       (update): Fail in default case.  Always initialize `strat'.
+
        * mauve-libgcj: Enable java.util.zip.
 
 1999-05-18  Warren Levy  <warrenl@cygnus.com>

diff --git a/libjava/java/util/zip/natDeflater.cc b/libjava/java/util/zip/natDeflater.cc
index 07cf009454fdc9957feb0e2e4d52a2b2436598fc..58d873a970ac1c70c0d46503892773bbf039d622 100644 (file)
--- a/libjava/java/util/zip/natDeflater.cc
+++ b/libjava/java/util/zip/natDeflater.cc
@@ -13,6 +13,7 @@ details.  */
 #include <config.h>
 
 #include <zlib.h>
+#include <stdlib.h>
 
 #include <cni.h>
 #include <jvm.h>
@@ -47,7 +48,7 @@ java::util::zip::Deflater::deflate (jbyteArray buf, jint off, jint len)
     {
     case Z_STREAM_END:
       is_finished = true;
-      if (s->avail_out == len)
+      if (s->avail_out == (unsigned int) len)
        return -1;
       break;
 
@@ -160,7 +161,7 @@ java::util::zip::Deflater::update ()
   JvSynchronize sync (this);
   z_streamp s = (z_streamp) zstream;
 
-  int strat;
+  int strat = Z_DEFAULT_STRATEGY;
   switch (strategy)
     {
     case DEFAULT_STRATEGY:
@@ -172,6 +173,8 @@ java::util::zip::Deflater::update ()
     case HUFFMAN_ONLY:
       strat = Z_HUFFMAN_ONLY;
       break;
+    default:
+      JvFail ("unexpected strategy");
     }
 
   // Ignore errors.

diff --git a/libjava/java/util/zip/natInflater.cc b/libjava/java/util/zip/natInflater.cc
index b33ab50747f15142db20d7e532170c9caad35fb0..4b83835e66297cb45181ac2aa6dfdd1a4126e7cf 100644 (file)
--- a/libjava/java/util/zip/natInflater.cc
+++ b/libjava/java/util/zip/natInflater.cc
@@ -13,6 +13,7 @@ details.  */
 #include <config.h>
 
 #include <zlib.h>
+#include <stdlib.h>
 
 #include <cni.h>
 #include <jvm.h>
@@ -104,7 +105,7 @@ java::util::zip::Inflater::inflate (jbyteArray buf, jint off, jint len)
     {
     case Z_STREAM_END:
       is_finished = true;
-      if (s->avail_out == len)
+      if (s->avail_out == (unsigned int) len)
        return -1;
       break;