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 2008/06/11 15:30:18 UTC
svn commit: r666659 - in
/harmony/enhanced/classlib/trunk/modules/luni/src/main/native:
include/unix/jclprots.h include/windows/jclprots.h luni/shared/inetadds.c
luni/shared/nethelp.c luni/shared/nethelp.h
Author: hindessm
Date: Wed Jun 11 06:30:17 2008
New Revision: 666659
URL: http://svn.apache.org/viewvc?rev=666659&view=rev
Log:
Fix compiler warning in modules/luni/src/main/native/luni/shared/inetadds.c
and the parameters of affected methods.
Modified:
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/jclprots.h
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/inetadds.c
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/nethelp.c
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/nethelp.h
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/jclprots.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/jclprots.h?rev=666659&r1=666658&r2=666659&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/jclprots.h (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/jclprots.h Wed Jun 11 06:30:17 2008
@@ -188,7 +188,7 @@
/* NativesCommonNetHelpers*/
void throwJavaNetBindException PROTOTYPE((JNIEnv* env, I_32 errorNumber));
-jobject newJavaNetInetAddressGenericBS PROTOTYPE((JNIEnv * env, jbyte *address, U_32 length, char *hostName, U_32 scope_id ));
+jobject newJavaNetInetAddressGenericBS PROTOTYPE((JNIEnv * env, jbyte *address, U_32 length, const char *hostName, U_32 scope_id ));
void throwJavaNetUnknownHostException PROTOTYPE((JNIEnv* env, I_32 errorNumber));
jobject newJavaNetInetAddressGenericB PROTOTYPE((JNIEnv * env, jbyte *address, U_32 length, U_32 scope_id ));
jobject newJavaLangByte PROTOTYPE((JNIEnv * env, U_8 aByte));
@@ -196,7 +196,7 @@
I_32 intValue PROTOTYPE((JNIEnv * env, jobject anInteger));
void throwJavaNetPortUnreachableException PROTOTYPE((JNIEnv* env, I_32 errorNumber));
jobject newJavaByteArray PROTOTYPE((JNIEnv * env, jbyte *bytes, jint length));
-jobjectArray createAliasArrayFromAddrinfo PROTOTYPE((JNIEnv* env, hyaddrinfo_t addresses, char* hName ));
+jobjectArray createAliasArrayFromAddrinfo PROTOTYPE((JNIEnv* env, hyaddrinfo_t addresses, const char* hName ));
BOOLEAN booleanValue PROTOTYPE((JNIEnv * env, jobject aBoolean));
jobject newJavaLangInteger PROTOTYPE((JNIEnv * env, I_32 anInt));
BOOLEAN preferIPv4Stack PROTOTYPE((JNIEnv * env));
@@ -211,7 +211,7 @@
void throwJavaNetConnectException PROTOTYPE((JNIEnv* env, I_32 errorNumber));
void netGetJavaNetInetAddressScopeId PROTOTYPE((JNIEnv * env, jobject anInetAddress, U_32 *scope_id));
BOOLEAN preferIPv6Addresses PROTOTYPE((JNIEnv * env));
-jobjectArray createAliasArray PROTOTYPE((JNIEnv* env, jbyte **addresses, I_32 *family, U_32 count, char* hName, U_32* scope_id_array ));
+jobjectArray createAliasArray PROTOTYPE((JNIEnv* env, jbyte **addresses, I_32 *family, U_32 count, const char* hName, U_32* scope_id_array ));
void throwJavaNetSocketException PROTOTYPE((JNIEnv* env, I_32 errorNumber));
I_32 netGetSockAddr PROTOTYPE((JNIEnv *env, jobject fileDescriptor, hysockaddr_t sockaddrP, jboolean preferIPv6Addresses));
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h?rev=666659&r1=666658&r2=666659&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h Wed Jun 11 06:30:17 2008
@@ -343,8 +343,8 @@
/* NativesCommonNetHelpers*/
void throwJavaNetBindException PROTOTYPE ((JNIEnv * env, I_32 errorNumber));
jobject newJavaNetInetAddressGenericBS
- PROTOTYPE ((JNIEnv * env, jbyte * address, U_32 length, char *hostName,
- U_32 scope_id));
+ PROTOTYPE ((JNIEnv * env, jbyte * address, U_32 length,
+ const char *hostName, U_32 scope_id));
void throwJavaNetUnknownHostException
PROTOTYPE ((JNIEnv * env, I_32 errorNumber));
jobject newJavaNetInetAddressGenericB
@@ -357,7 +357,7 @@
jobject newJavaByteArray
PROTOTYPE ((JNIEnv * env, jbyte * bytes, jint length));
jobjectArray createAliasArrayFromAddrinfo
- PROTOTYPE ((JNIEnv * env, hyaddrinfo_t addresses, char *hName));
+ PROTOTYPE ((JNIEnv * env, hyaddrinfo_t addresses, const char *hName));
BOOLEAN booleanValue PROTOTYPE ((JNIEnv * env, jobject aBoolean));
jobject newJavaLangInteger PROTOTYPE ((JNIEnv * env, I_32 anInt));
BOOLEAN preferIPv4Stack PROTOTYPE ((JNIEnv * env));
@@ -382,7 +382,7 @@
BOOLEAN preferIPv6Addresses PROTOTYPE ((JNIEnv * env));
jobjectArray createAliasArray
PROTOTYPE ((JNIEnv * env, jbyte ** addresses, I_32 * family, U_32 count,
- char *hName, U_32 * scope_id_array));
+ const char *hName, U_32 * scope_id_array));
void throwJavaNetSocketException
PROTOTYPE ((JNIEnv * env, I_32 errorNumber));
I_32 netGetSockAddr
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/inetadds.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/inetadds.c?rev=666659&r1=666658&r2=666659&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/inetadds.c (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/inetadds.c Wed Jun 11 06:30:17 2008
@@ -65,7 +65,7 @@
return NULL;
}
- aliases = createAliasArrayFromAddrinfo (env, &addrinfo, (char *) str);
+ aliases = createAliasArrayFromAddrinfo (env, &addrinfo, str);
hysock_freeaddrinfo (&addrinfo);
(*env)->ReleaseStringUTFChars (env, aName, str);
return aliases;
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/nethelp.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/nethelp.c?rev=666659&r1=666658&r2=666659&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/nethelp.c (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/nethelp.c Wed Jun 11 06:30:17 2008
@@ -733,7 +733,7 @@
jobjectArray
createAliasArray (JNIEnv * env, jbyte ** addresses, I_32 * family, U_32 count,
- char *hName, U_32 * scope_id_array)
+ const char *hName, U_32 * scope_id_array)
{
U_32 i, length;
jobjectArray aliases = NULL;
@@ -786,7 +786,7 @@
jobjectArray
createAliasArrayFromAddrinfo (JNIEnv * env, hyaddrinfo_t addresses,
- char *hName)
+ const char *hName)
{
PORT_ACCESS_FROM_ENV (env);
U_32 count = 0;
@@ -1026,7 +1026,7 @@
jobject
newJavaNetInetAddressGenericBS (JNIEnv * env, jbyte * address, U_32 length,
- char *hostName, U_32 scope_id)
+ const char *hostName, U_32 scope_id)
{
jclass tempClass;
jmethodID tempMethod;
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/nethelp.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/nethelp.h?rev=666659&r1=666658&r2=666659&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/nethelp.h (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/nethelp.h Wed Jun 11 06:30:17 2008
@@ -46,7 +46,7 @@
getJavaIoFileDescriptorContentsAsAPointer (JNIEnv * env, jobject fd);
void throwJavaNetBindException (JNIEnv * env, I_32 errorNumber);
jobject newJavaNetInetAddressGenericBS (JNIEnv * env, jbyte * address,
- U_32 length, char *hostName,
+ U_32 length, const char *hostName,
U_32 scope_id);
void throwJavaNetUnknownHostException (JNIEnv * env, I_32 errorNumber);
jobject newJavaNetInetAddressGenericB (JNIEnv * env, jbyte * address,
@@ -58,7 +58,7 @@
jobject newJavaByteArray (JNIEnv * env, jbyte * bytes, jint length);
jobjectArray createAliasArrayFromAddrinfo (JNIEnv * env,
hyaddrinfo_t addresses,
- char *hName);
+ const char *hName);
BOOLEAN booleanValue (JNIEnv * env, jobject aBoolean);
BOOLEAN harmony_supports_ipv6 (JNIEnv * env);
jobject newJavaLangInteger (JNIEnv * env, I_32 anInt);
@@ -77,7 +77,7 @@
U_32 * scope_id);
BOOLEAN preferIPv6Addresses (JNIEnv * env);
jobjectArray createAliasArray (JNIEnv * env, jbyte ** addresses,
- I_32 * family, U_32 count, char *hName,
+ I_32 * family, U_32 count, const char *hName,
U_32 * scope_id_array);
void throwJavaNetSocketException (JNIEnv * env, I_32 errorNumber);
I_32 netGetSockAddr (JNIEnv * env, jobject fileDescriptor,