You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2009/02/18 10:37:31 UTC
svn commit: r745454 - in
/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni:
shared/netif.c unix/helpers.c unix/helpers.h windows/helpers.c
windows/helpers.h
Author: hindessm
Date: Wed Feb 18 09:37:31 2009
New Revision: 745454
URL: http://svn.apache.org/viewvc?rev=745454&view=rev
Log:
Fix inconsistent function names.
Modified:
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/netif.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/helpers.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/helpers.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.h
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/netif.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/netif.c?rev=745454&r1=745453&r2=745454&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/netif.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/netif.c Wed Feb 18 09:37:31 2009
@@ -1274,7 +1274,7 @@
JNIEXPORT jint JNICALL
Java_java_net_NetworkInterface_getMTUImpl (JNIEnv * env, jobject obj, jstring ifname, jint index)
{
- return getPlatformGetMTU(env, ifname, index);
+ return getPlatformMTU(env, ifname, index);
}
char*
@@ -1362,7 +1362,7 @@
// get the interface address info according to different system calls.
- result = getPlatformGetInterfaceAddresses(env, ifname, index, &interfaceAddressArray);
+ result = getPlatformInterfaceAddresses(env, ifname, index, &interfaceAddressArray);
if (result != 0) {
/* this means an error occured. The value returned is the socket error that should be returned */
@@ -1405,10 +1405,10 @@
return interfaceAddresses;
}
-jbyteArray getPlatformGetHardwareAddress(JNIEnv * env, jstring ifname, jint index);
+jbyteArray getPlatformHardwareAddress(JNIEnv * env, jstring ifname, jint index);
JNIEXPORT jbyteArray JNICALL
Java_java_net_NetworkInterface_getHardwareAddressImpl(JNIEnv * env, jobject obj, jstring ifname, jint index)
{
- return getPlatformGetHardwareAddress(env, ifname, index);
+ return getPlatformHardwareAddress(env, ifname, index);
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/helpers.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/helpers.c?rev=745454&r1=745453&r2=745454&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/helpers.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/helpers.c Wed Feb 18 09:37:31 2009
@@ -422,7 +422,7 @@
}
jint
-getPlatformGetMTU(JNIEnv * env, jstring ifname, jint index)
+getPlatformMTU(JNIEnv * env, jstring ifname, jint index)
{
struct ifconf ifc;
char buff[2048];
@@ -472,7 +472,7 @@
}
jbyteArray
-getPlatformGetHardwareAddress(JNIEnv * env, jstring ifname, jint index)
+getPlatformHardwareAddress(JNIEnv * env, jstring ifname, jint index)
{
const int MAC_ADDR_SIZE = 6;
@@ -709,7 +709,7 @@
}
I_32
-getPlatformGetInterfaceAddresses(JNIEnv * env,
+getPlatformInterfaceAddresses(JNIEnv * env,
jstring ifname,
jint index,
interfaceAddressArray_struct* interfaceAddressArray)
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/helpers.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/helpers.h?rev=745454&r1=745453&r2=745454&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/helpers.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/helpers.h Wed Feb 18 09:37:31 2009
@@ -65,8 +65,8 @@
jboolean getPlatformIsLoopback(JNIEnv * env, jstring ifname, jint index);
jboolean getPlatformIsPoint2Point(JNIEnv * env, jstring ifname, jint index);
jboolean getPlatformSupportMulticast(JNIEnv * env, jstring ifname, jint index);
-jint getPlatformGetMTU(JNIEnv * env, jstring ifname, jint index);
-I_32 getPlatformGetInterfaceAddresses(JNIEnv * env, jstring ifname, jint index, interfaceAddressArray_struct* interfaceAddressArray);
+jint getPlatformMTU(JNIEnv * env, jstring ifname, jint index);
+I_32 getPlatformInterfaceAddresses(JNIEnv * env, jstring ifname, jint index, interfaceAddressArray_struct* interfaceAddressArray);
I_32 getPlatformIsExecutable (JNIEnv * env, char *path);
I_32 setPlatformExecutable (JNIEnv * env, char *path, jboolean executable, jboolean ownerOnly);
I_32 hasPrivilegeInOtherGroups(JNIEnv * env, struct stat * buffer, mode_t attr);
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.c?rev=745454&r1=745453&r2=745454&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.c Wed Feb 18 09:37:31 2009
@@ -785,7 +785,7 @@
jint
-getPlatformGetMTU(JNIEnv * env, jstring ifname, jint index)
+getPlatformMTU(JNIEnv * env, jstring ifname, jint index)
{
PIP_ADAPTER_ADDRESSES AdapterAddresses = NULL;
ULONG OutBufferLength = 0;
@@ -822,7 +822,7 @@
}
jbyteArray
-getPlatformGetHardwareAddress(JNIEnv * env, jstring ifname, jint index)
+getPlatformHardwareAddress(JNIEnv * env, jstring ifname, jint index)
{
PIP_ADAPTER_ADDRESSES AdapterAddresses = NULL;
ULONG OutBufferLength = 0;
@@ -864,7 +864,7 @@
void
-getPlatformGetInterfaceAddressesImpl(JNIEnv * env,
+getPlatformInterfaceAddressesImpl(JNIEnv * env,
char* name,
jint index,
PIP_ADAPTER_ADDRESSES adapters,
@@ -1021,7 +1021,7 @@
}
I_32
-getPlatformGetInterfaceAddresses(JNIEnv * env, jstring ifname, jint index, interfaceAddressArray_struct * interfaceAddressArray)
+getPlatformInterfaceAddresses(JNIEnv * env, jstring ifname, jint index, interfaceAddressArray_struct * interfaceAddressArray)
{
PIP_ADAPTER_ADDRESSES AdapterAddresses = NULL;
PIP_ADAPTER_ADDRESSES Adapters = NULL;
@@ -1036,7 +1036,7 @@
char* adapterName = convertInterfaceName(env, ifname);
if (NULL != adapterName)
{
- getPlatformGetInterfaceAddressesImpl (env, adapterName, index, AdapterAddresses, interfaceAddressArray);
+ getPlatformInterfaceAddressesImpl (env, adapterName, index, AdapterAddresses, interfaceAddressArray);
hymem_free_memory (adapterName);
}
} else {
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.h?rev=745454&r1=745453&r2=745454&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.h Wed Feb 18 09:37:31 2009
@@ -60,8 +60,8 @@
jboolean getPlatformIsLoopback(JNIEnv * env, jstring ifname, jint index);
jboolean getPlatformIsPoint2Point(JNIEnv * env, jstring ifname, jint index);
jboolean getPlatformSupportMulticast(JNIEnv * env, jstring ifname, jint index);
-jint getPlatformGetMTU(JNIEnv * env, jstring ifname, jint index);
-jbyteArray getPlatformGetHardwareAddress(JNIEnv * env, jstring ifname, jint index);
-I_32 getPlatformGetInterfaceAddresses(JNIEnv * env, jstring ifname, jint index, interfaceAddressArray_struct* interfaceAddressArray);
+jint getPlatformMTU(JNIEnv * env, jstring ifname, jint index);
+jbyteArray getPlatformHardwareAddress(JNIEnv * env, jstring ifname, jint index);
+I_32 getPlatformInterfaceAddresses(JNIEnv * env, jstring ifname, jint index, interfaceAddressArray_struct* interfaceAddressArray);
I_32 freeInterfaceAddressArray(JNIEnv * env, struct interfaceAddressArray_struct * array);
#endif /* helpers_h */