diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-11 17:13:51 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-11 17:13:51 -0400 |
| commit | 17ae753d638df37e7e0b66ea0435212c2f2b682d (patch) | |
| tree | 708d3b05a0d0151bf86fbdf09ba5db7fa3dd913d /archive/src | |
| parent | 6e78d0a52d299359d1bddd607f085903e24ee3aa (diff) | |
| parent | 9ee0ceadae7cc5cdedf675f515b653cd626af132 (diff) | |
| download | libcore-17ae753d638df37e7e0b66ea0435212c2f2b682d.zip libcore-17ae753d638df37e7e0b66ea0435212c2f2b682d.tar.gz libcore-17ae753d638df37e7e0b66ea0435212c2f2b682d.tar.bz2 | |
Merge change 24610
* changes:
Several small native code fixes.
Diffstat (limited to 'archive/src')
| -rw-r--r-- | archive/src/main/native/java_util_zip_Adler32.c | 9 | ||||
| -rw-r--r-- | archive/src/main/native/java_util_zip_CRC32.c | 8 |
2 files changed, 4 insertions, 13 deletions
diff --git a/archive/src/main/native/java_util_zip_Adler32.c b/archive/src/main/native/java_util_zip_Adler32.c index 1b02a11..0fcf549 100644 --- a/archive/src/main/native/java_util_zip_Adler32.c +++ b/archive/src/main/native/java_util_zip_Adler32.c @@ -25,16 +25,11 @@ Java_java_util_zip_Adler32_updateImpl (JNIEnv * env, jobject recv, jbyteArray buf, int off, int len, jlong crc) { - jbyte *b; - jboolean isCopy; - jlong result; - - b = (*env)->GetPrimitiveArrayCritical (env, buf, &isCopy); + jbyte* b = (*env)->GetPrimitiveArrayCritical (env, buf, NULL); if (b == NULL) { - throwNewOutOfMemoryError(env, ""); return 0; } - result = (jlong) adler32 ((uLong) crc, (Bytef *) (b + off), (uInt) len); + jlong result = (jlong) adler32 ((uLong) crc, (Bytef *) (b + off), (uInt) len); (*env)->ReleasePrimitiveArrayCritical (env, buf, b, JNI_ABORT); return result; diff --git a/archive/src/main/native/java_util_zip_CRC32.c b/archive/src/main/native/java_util_zip_CRC32.c index cee25e5..fe50fca 100644 --- a/archive/src/main/native/java_util_zip_CRC32.c +++ b/archive/src/main/native/java_util_zip_CRC32.c @@ -25,15 +25,11 @@ Java_java_util_zip_CRC32_updateImpl (JNIEnv * env, jobject recv, jbyteArray buf, int off, int len, jlong crc) { - jbyte *b; - jlong result; - - b = ((*env)->GetPrimitiveArrayCritical (env, buf, 0)); + jbyte* b = ((*env)->GetPrimitiveArrayCritical (env, buf, 0)); if (b == NULL) { - throwNewOutOfMemoryError(env, ""); return -1; } - result = crc32 ((uLong) crc, (Bytef *) (b + off), (uInt) len); + jlong result = crc32 ((uLong) crc, (Bytef *) (b + off), (uInt) len); ((*env)->ReleasePrimitiveArrayCritical (env, buf, b, JNI_ABORT)); return result; } |