mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-23 07:59:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Tom Tromey 1999-05-19 11:03:36 +00:00 committed by Tom Tromey
parent 6bdb8141ec
commit 6ada3468d8
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,5 +1,11 @@
1999-05-19 Tom Tromey <tromey@cygnus.com> 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. * mauve-libgcj: Enable java.util.zip.
1999-05-18 Warren Levy <warrenl@cygnus.com> 1999-05-18 Warren Levy <warrenl@cygnus.com>

7
libjava/java/util/zip/natDeflater.cc
View File

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

3
libjava/java/util/zip/natInflater.cc
View File

@ -13,6 +13,7 @@ details. */
#include <config.h> #include <config.h>
#include <zlib.h> #include <zlib.h>
#include <stdlib.h>
#include <cni.h> #include <cni.h>
#include <jvm.h> #include <jvm.h>
@ -104,7 +105,7 @@ java::util::zip::Inflater::inflate (jbyteArray buf, jint off, jint len)
{ {
case Z_STREAM_END: case Z_STREAM_END:
is_finished = true; is_finished = true;
if (s->avail_out == len) if (s->avail_out == (unsigned int) len)
return -1; return -1;
break; break;