stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8212000: Verify exported symbols in java.base (libnet, libnio/ch)

Browse Source 
Reviewed-by: alanb, chegar
This commit is contained in:
Pavel Rappo 2018-10-10 14:13:32 +01:00
parent df92fc0954
commit a9efcea778
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java.base/share/native/libnet/net_util.h
View File

@ -122,8 +122,6 @@ JNIEXPORT void JNICALL Java_java_net_NetworkInterface_init(JNIEnv *env, jclass c
JNIEXPORT void JNICALL NET_ThrowNew(JNIEnv *env, int errorNum, char *msg); JNIEXPORT void JNICALL NET_ThrowNew(JNIEnv *env, int errorNum, char *msg);
int NET_GetError();
void NET_ThrowCurrent(JNIEnv *env, char *msg); void NET_ThrowCurrent(JNIEnv *env, char *msg);
jfieldID NET_GetFileDescriptorID(JNIEnv *env); jfieldID NET_GetFileDescriptorID(JNIEnv *env);
@ -202,7 +200,6 @@ NET_EnableFastTcpLoopback(int fd);
unsigned short in_cksum(unsigned short *addr, int len); unsigned short in_cksum(unsigned short *addr, int len);
JNIEXPORT jint JNICALL jint NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout);
NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout);
#endif /* NET_UTILS_H */ #endif /* NET_UTILS_H */

2
src/java.base/unix/native/libnet/net_util_md.c
View File

@ -1546,7 +1546,7 @@ NET_Bind(int fd, SOCKETADDRESS *sa, int len)
* It returns the time left from the timeout (possibly 0), or -1 if it expired. * 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) NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout)
{ {
jlong prevNanoTime = JVM_NanoTime(env, 0); jlong prevNanoTime = JVM_NanoTime(env, 0);

3
src/java.base/unix/native/libnio/ch/Net.c
View File

@ -747,8 +747,7 @@ Java_sun_nio_ch_Net_pollconnValue(JNIEnv *env, jclass this)
/* Declared in nio_util.h */ /* Declared in nio_util.h */
JNIEXPORT jint JNICALL jint handleSocketError(JNIEnv *env, jint errorValue)
handleSocketError(JNIEnv *env, jint errorValue)
{ {
char *xn; char *xn;
switch (errorValue) { switch (errorValue) {

3
src/java.base/unix/native/libnio/ch/nio_util.h
View File

@ -62,5 +62,4 @@ jlong convertLongReturnVal(JNIEnv *env, jlong n, jboolean reading);
/* Defined in Net.c */ /* Defined in Net.c */
JNIEXPORT jint JNICALL jint handleSocketError(JNIEnv *env, jint errorValue);
handleSocketError(JNIEnv *env, jint errorValue);

2
src/java.base/windows/native/libnet/net_util_md.c
View File

@ -903,7 +903,7 @@ NET_IsEqual(jbyte* caddr1, jbyte* caddr2) {
* It returns the time left from the timeout, or -1 if it expired. * 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) NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout)
{ {
jlong prevTime = JVM_CurrentTimeMillis(env, 0); jlong prevTime = JVM_CurrentTimeMillis(env, 0);