OpenJDK / portola / portola
changeset 50561:75a03a4cfbca
8204663: clean up remaining native parts after JDK-8187631
Reviewed-by: rriggs, psandoz
| author | stuefe |
|---|---|
| date | Wed, 13 Jun 2018 20:11:18 +0200 |
| parents | c7633e5f8657 |
| children | 41ff671ed8cf |
| files | src/java.base/unix/native/libjava/FileOutputStream_md.c src/java.base/unix/native/libjava/io_util_md.c src/java.base/unix/native/libjava/io_util_md.h src/java.base/windows/native/libjava/FileOutputStream_md.c src/java.base/windows/native/libjava/io_util_md.c src/java.base/windows/native/libjava/io_util_md.h |
| diffstat | 6 files changed, 0 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.base/unix/native/libjava/FileOutputStream_md.c Wed Jun 13 13:48:39 2018 -0400 +++ b/src/java.base/unix/native/libjava/FileOutputStream_md.c Wed Jun 13 20:11:18 2018 +0200 @@ -70,7 +70,3 @@ writeBytes(env, this, bytes, off, len, append, fos_fd); } -void JNICALL -Java_java_io_FileOutputStream_close0(JNIEnv *env, jobject this) { - fileClose(env, this, fos_fd); -}
--- a/src/java.base/unix/native/libjava/io_util_md.c Wed Jun 13 13:48:39 2018 -0400 +++ b/src/java.base/unix/native/libjava/io_util_md.c Wed Jun 13 20:11:18 2018 +0200 @@ -121,16 +121,6 @@ } END_PLATFORM_STRING(env, ps); } -void -fileClose(JNIEnv *env, jobject this, jfieldID fid) -{ - jobject fileDescriptor = (*env)->GetObjectField(env, (this), (fid)); - if (fileDescriptor == NULL) { - return; - } - fileDescriptorClose(env, fileDescriptor); -} - // Function to close the fd held by this FileDescriptor and set fd to -1. void fileDescriptorClose(JNIEnv *env, jobject this)
--- a/src/java.base/unix/native/libjava/io_util_md.h Wed Jun 13 13:48:39 2018 -0400 +++ b/src/java.base/unix/native/libjava/io_util_md.h Wed Jun 13 20:11:18 2018 +0200 @@ -99,10 +99,6 @@ } while((_result == -1) && (errno == EINTR)); \ } while(0) -/* - * IO helper function(s) - */ -void fileClose(JNIEnv *env, jobject this, jfieldID fid); void fileDescriptorClose(JNIEnv *env, jobject this); #ifdef MACOSX
--- a/src/java.base/windows/native/libjava/FileOutputStream_md.c Wed Jun 13 13:48:39 2018 -0400 +++ b/src/java.base/windows/native/libjava/FileOutputStream_md.c Wed Jun 13 20:11:18 2018 +0200 @@ -72,7 +72,3 @@ writeBytes(env, this, bytes, off, len, append, fos_fd); } -JNIEXPORT void JNICALL -Java_java_io_FileOutputStream_close0(JNIEnv *env, jobject this) { - handleClose(env, this, fos_fd); -}
--- a/src/java.base/windows/native/libjava/io_util_md.c Wed Jun 13 13:48:39 2018 -0400 +++ b/src/java.base/windows/native/libjava/io_util_md.c Wed Jun 13 20:11:18 2018 +0200 @@ -535,16 +535,6 @@ return writeInternal(fd, buf, len, JNI_TRUE); } -void -handleClose(JNIEnv *env, jobject this, jfieldID fid) -{ - jobject fileDescriptor = (*env)->GetObjectField(env, (this), (fid)); - if (fileDescriptor == NULL) { - return; - } - fileDescriptorClose(env, fileDescriptor); -} - // Function to close the fd held by this FileDescriptor and set fd to -1. void fileDescriptorClose(JNIEnv *env, jobject this)
--- a/src/java.base/windows/native/libjava/io_util_md.h Wed Jun 13 13:48:39 2018 -0400 +++ b/src/java.base/windows/native/libjava/io_util_md.h Wed Jun 13 20:11:18 2018 +0200 @@ -48,7 +48,6 @@ JNIEXPORT jint handleRead(FD fd, void *buf, jint len); jint handleWrite(FD fd, const void *buf, jint len); jint handleAppend(FD fd, const void *buf, jint len); -void handleClose(JNIEnv *env, jobject this, jfieldID fid); void fileDescriptorClose(JNIEnv *env, jobject this); JNIEXPORT jlong JNICALL handleLseek(FD fd, jlong offset, jint whence);