OpenJDK / portola / portola
changeset 52093:1c8745e31fa3
8212000: Verify exported symbols in java.base (libnet, libnio/ch)
Reviewed-by: alanb, chegar
| author | prappo |
|---|---|
| date | Wed, 10 Oct 2018 14:13:32 +0100 |
| parents | 3be7d098f4a6 |
| children | 755b367c2134 |
| files | src/java.base/share/native/libnet/net_util.h src/java.base/unix/native/libnet/net_util_md.c src/java.base/unix/native/libnio/ch/Net.c src/java.base/unix/native/libnio/ch/nio_util.h src/java.base/windows/native/libnet/net_util_md.c |
| diffstat | 5 files changed, 5 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.base/share/native/libnet/net_util.h Wed Oct 10 14:28:35 2018 +0200 +++ b/src/java.base/share/native/libnet/net_util.h Wed Oct 10 14:13:32 2018 +0100 @@ -122,8 +122,6 @@ JNIEXPORT void JNICALL NET_ThrowNew(JNIEnv *env, int errorNum, char *msg); -int NET_GetError(); - void NET_ThrowCurrent(JNIEnv *env, char *msg); jfieldID NET_GetFileDescriptorID(JNIEnv *env); @@ -202,7 +200,6 @@ unsigned short in_cksum(unsigned short *addr, int len); -JNIEXPORT jint JNICALL -NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout); +jint NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout); #endif /* NET_UTILS_H */
--- a/src/java.base/unix/native/libnet/net_util_md.c Wed Oct 10 14:28:35 2018 +0200 +++ b/src/java.base/unix/native/libnet/net_util_md.c Wed Oct 10 14:13:32 2018 +0100 @@ -1546,7 +1546,7 @@ * It returns the time left from the timeout (possibly 0), or -1 if it expired. */ -JNIEXPORT jint JNICALL +jint NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout) { jlong prevNanoTime = JVM_NanoTime(env, 0);
--- a/src/java.base/unix/native/libnio/ch/Net.c Wed Oct 10 14:28:35 2018 +0200 +++ b/src/java.base/unix/native/libnio/ch/Net.c Wed Oct 10 14:13:32 2018 +0100 @@ -747,8 +747,7 @@ /* Declared in nio_util.h */ -JNIEXPORT jint JNICALL -handleSocketError(JNIEnv *env, jint errorValue) +jint handleSocketError(JNIEnv *env, jint errorValue) { char *xn; switch (errorValue) {
--- a/src/java.base/unix/native/libnio/ch/nio_util.h Wed Oct 10 14:28:35 2018 +0200 +++ b/src/java.base/unix/native/libnio/ch/nio_util.h Wed Oct 10 14:13:32 2018 +0100 @@ -62,5 +62,4 @@ /* Defined in Net.c */ -JNIEXPORT jint JNICALL -handleSocketError(JNIEnv *env, jint errorValue); +jint handleSocketError(JNIEnv *env, jint errorValue);
--- a/src/java.base/windows/native/libnet/net_util_md.c Wed Oct 10 14:28:35 2018 +0200 +++ b/src/java.base/windows/native/libnet/net_util_md.c Wed Oct 10 14:13:32 2018 +0100 @@ -903,7 +903,7 @@ * It returns the time left from the timeout, or -1 if it expired. */ -JNIEXPORT jint JNICALL +jint NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout) { jlong prevTime = JVM_CurrentTimeMillis(env, 0);