diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-05-19 11:03:36 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-05-19 11:03:36 +0000 |
| commit | 72228638c4eb5c0b98ed74549ac70bd0c3e3962e (patch) | |
| tree | 7117d868d97dcad9bc6f734d9bb197b468ee6c92 /libjava/java/util/zip/natDeflater.cc | |
| parent | 128e1d722d6a685ec6be49e5f11739ba9a76f9a8 (diff) | |
| download | ppe42-gcc-72228638c4eb5c0b98ed74549ac70bd0c3e3962e.tar.gz ppe42-gcc-72228638c4eb5c0b98ed74549ac70bd0c3e3962e.zip | |
* 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'.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27028 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util/zip/natDeflater.cc')
| -rw-r--r-- | libjava/java/util/zip/natDeflater.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libjava/java/util/zip/natDeflater.cc b/libjava/java/util/zip/natDeflater.cc index 07cf009454f..58d873a970a 100644 --- 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. |
