diff options
Diffstat (limited to 'libjava/java/util')
| -rw-r--r-- | libjava/java/util/zip/natDeflater.cc | 16 | ||||
| -rw-r--r-- | libjava/java/util/zip/natInflater.cc | 20 |
2 files changed, 18 insertions, 18 deletions
diff --git a/libjava/java/util/zip/natDeflater.cc b/libjava/java/util/zip/natDeflater.cc index 8ef6cf6..934d870 100644 --- a/libjava/java/util/zip/natDeflater.cc +++ b/libjava/java/util/zip/natDeflater.cc @@ -37,9 +37,9 @@ java::util::zip::Deflater::deflate (jbyteArray buf, jint off, jint len) z_streamp s = (z_streamp) zstream; if (! buf) - _Jv_Throw (new java::lang::NullPointerException); + throw new java::lang::NullPointerException; if (off < 0 || len < 0 || off + len > buf->length) - _Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException); + throw new java::lang::ArrayIndexOutOfBoundsException; if (len == 0) return 0; @@ -58,7 +58,7 @@ java::util::zip::Deflater::deflate (jbyteArray buf, jint off, jint len) case Z_STREAM_ERROR: case Z_BUF_ERROR: // FIXME? - _Jv_Throw (new java::lang::InternalError); + throw new java::lang::InternalError; break; case Z_OK: @@ -134,9 +134,9 @@ java::util::zip::Deflater::setDictionary (jbyteArray buf, jint off, jint len) z_streamp s = (z_streamp) zstream; if (! buf) - _Jv_Throw (new java::lang::NullPointerException); + throw new java::lang::NullPointerException; if (off < 0 || len < 0 || off + len > buf->length) - _Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException); + throw new java::lang::ArrayIndexOutOfBoundsException; // Ignore errors. deflateSetDictionary (s, (Bytef *) (elements (buf) + off), len); @@ -149,9 +149,9 @@ java::util::zip::Deflater::setInput (jbyteArray buf, jint off, jint len) z_streamp s = (z_streamp) zstream; if (! buf) - _Jv_Throw (new java::lang::NullPointerException); + throw new java::lang::NullPointerException; if (off < 0 || len < 0 || off + len > buf->length) - _Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException); + throw new java::lang::ArrayIndexOutOfBoundsException; s->next_in = (Bytef *) (elements (buf) + off); s->avail_in = len; @@ -205,7 +205,7 @@ java::util::zip::Deflater::init (jint level, jboolean no_header) jstring msg = NULL; if (stream->msg != NULL) msg = JvNewStringLatin1 (stream->msg); - _Jv_Throw (new java::lang::InternalError (msg)); + throw new java::lang::InternalError (msg); } zstream = reinterpret_cast<gnu::gcj::RawData *> (stream); diff --git a/libjava/java/util/zip/natInflater.cc b/libjava/java/util/zip/natInflater.cc index a9768fc..0d1529b 100644 --- a/libjava/java/util/zip/natInflater.cc +++ b/libjava/java/util/zip/natInflater.cc @@ -94,9 +94,9 @@ java::util::zip::Inflater::inflate (jbyteArray buf, jint off, jint len) z_streamp s = (z_streamp) zstream; if (! buf) - _Jv_Throw (new java::lang::NullPointerException); + throw new java::lang::NullPointerException; if (off < 0 || len < 0 || off + len > buf->length) - _Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException); + throw new java::lang::ArrayIndexOutOfBoundsException; if (len == 0) return 0; @@ -127,12 +127,12 @@ java::util::zip::Inflater::inflate (jbyteArray buf, jint off, jint len) break; case Z_DATA_ERROR: - _Jv_Throw (new java::util::zip::DataFormatException - (s->msg == NULL ? NULL : JvNewStringLatin1 (s->msg))); + throw new java::util::zip::DataFormatException + (s->msg == NULL ? NULL : JvNewStringLatin1 (s->msg)); break; case Z_MEM_ERROR: - _Jv_Throw (new java::lang::OutOfMemoryError); + throw new java::lang::OutOfMemoryError; break; case Z_OK: @@ -158,9 +158,9 @@ java::util::zip::Inflater::setDictionary (jbyteArray buf, jint off, jint len) z_streamp s = (z_streamp) zstream; if (! buf) - _Jv_Throw (new java::lang::NullPointerException); + throw new java::lang::NullPointerException; if (off < 0 || len < 0 || off + len > buf->length) - _Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException); + throw new java::lang::ArrayIndexOutOfBoundsException; // Ignore errors. inflateSetDictionary (s, (Bytef *) (elements (buf) + off), len); @@ -174,9 +174,9 @@ java::util::zip::Inflater::setInput (jbyteArray buf, jint off, jint len) z_streamp s = (z_streamp) zstream; if (! buf) - _Jv_Throw (new java::lang::NullPointerException); + throw new java::lang::NullPointerException; if (off < 0 || len < 0 || off + len > buf->length) - _Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException); + throw new java::lang::ArrayIndexOutOfBoundsException; s->next_in = (Bytef *) (elements (buf) + off); s->avail_in = len; @@ -202,7 +202,7 @@ java::util::zip::Inflater::init (jboolean no_header) jstring msg = NULL; if (stream->msg != NULL) msg = JvNewStringLatin1 (stream->msg); - _Jv_Throw (new java::lang::InternalError (msg)); + throw new java::lang::InternalError (msg); } zstream = reinterpret_cast<gnu::gcj::RawData *> (stream); |