--- old/src/share/vm/prims/jvm.cpp 2012-03-29 14:45:37.289423100 +0200 +++ new/src/share/vm/prims/jvm.cpp 2012-03-29 14:45:36.810395700 +0200 @@ -3517,14 +3517,14 @@ JVM_LEAF(jint, JVM_Recv(jint fd, char *buf, jint nBytes, jint flags)) JVMWrapper2("JVM_Recv (0x%x)", fd); //%note jvm_r6 - return os::recv(fd, buf, (size_t)nBytes, (uint)flags); + return os::recv(fd, buf, nBytes, flags); JVM_END JVM_LEAF(jint, JVM_Send(jint fd, char *buf, jint nBytes, jint flags)) JVMWrapper2("JVM_Send (0x%x)", fd); //%note jvm_r6 - return os::send(fd, buf, (size_t)nBytes, (uint)flags); + return os::send(fd, buf, nBytes, flags); JVM_END @@ -3559,9 +3559,7 @@ JVM_LEAF(jint, JVM_Accept(jint fd, struct sockaddr *him, jint *len)) JVMWrapper2("JVM_Accept (0x%x)", fd); //%note jvm_r6 - socklen_t socklen = (socklen_t)(*len); - jint result = os::accept(fd, him, &socklen); - *len = (jint)socklen; + jint result = os::accept(fd, him, len); return result; JVM_END @@ -3569,9 +3567,7 @@ JVM_LEAF(jint, JVM_RecvFrom(jint fd, char *buf, int nBytes, int flags, struct sockaddr *from, int *fromlen)) JVMWrapper2("JVM_RecvFrom (0x%x)", fd); //%note jvm_r6 - socklen_t socklen = (socklen_t)(*fromlen); - jint result = os::recvfrom(fd, buf, (size_t)nBytes, (uint)flags, from, &socklen); - *fromlen = (int)socklen; + jint result = os::recvfrom(fd, buf, nBytes, flags, from, fromlen); return result; JVM_END @@ -3579,9 +3575,7 @@ JVM_LEAF(jint, JVM_GetSockName(jint fd, struct sockaddr *him, int *len)) JVMWrapper2("JVM_GetSockName (0x%x)", fd); //%note jvm_r6 - socklen_t socklen = (socklen_t)(*len); - jint result = os::get_sock_name(fd, him, &socklen); - *len = (int)socklen; + jint result = os::get_sock_name(fd, him, len); return result; JVM_END @@ -3603,9 +3597,7 @@ JVM_LEAF(jint, JVM_GetSockOpt(jint fd, int level, int optname, char *optval, int *optlen)) JVMWrapper2("JVM_GetSockOpt (0x%x)", fd); //%note jvm_r6 - socklen_t socklen = (socklen_t)(*optlen); - jint result = os::get_sock_opt(fd, level, optname, optval, &socklen); - *optlen = (int)socklen; + jint result = os::get_sock_opt(fd, level, optname, optval, optlen); return result; JVM_END @@ -3613,7 +3605,7 @@ JVM_LEAF(jint, JVM_SetSockOpt(jint fd, int level, int optname, const char *optval, int optlen)) JVMWrapper2("JVM_GetSockOpt (0x%x)", fd); //%note jvm_r6 - return os::set_sock_opt(fd, level, optname, optval, (socklen_t)optlen); + return os::set_sock_opt(fd, level, optname, optval, optlen); JVM_END