2006-01-04 Roman Kennke <kennke@aicas.com>

	* native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c,
	* native/jni/java-net/gnu_java_net_VMPlainDatagramSocketImpl.c:
	Added __attribute__((__unused__)) macros to avoid gcc warnings.

2 files changed, 78 insertions, 33 deletions

diff --git a/native/jni/java-net/gnu_java_net_VMPlainDatagramSocketImpl.c b/native/jni/java-net/gnu_java_net_VMPlainDatagramSocketImpl.c
index 1e3fabf99..e7cb55727 100644
--- a/native/jni/java-net/gnu_java_net_VMPlainDatagramSocketImpl.c
+++ b/native/jni/java-net/gnu_java_net_VMPlainDatagramSocketImpl.c
@@ -68,7 +68,9 @@ exception statement from your version. */
  * Creates a new datagram socket
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_create(JNIEnv *env, jclass klass, jobject obj)
+Java_gnu_java_net_VMPlainDatagramSocketImpl_create(JNIEnv *env,
+						   jclass klass __attribute__ ((__unused__))
+						   , jobject obj)
 {
   assert(env!=NULL);
   assert((*env)!=NULL);
@@ -85,7 +87,9 @@ Java_gnu_java_net_VMPlainDatagramSocketImpl_create(JNIEnv *env, jclass klass, jo
  * Close the socket.
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_close(JNIEnv *env, jclass klass, jobject obj)
+Java_gnu_java_net_VMPlainDatagramSocketImpl_close(JNIEnv *env,
+						  jclass klass __attribute__ ((__unused__)),
+						  jobject obj)
 {
   assert(env!=NULL);
   assert((*env)!=NULL);
@@ -102,7 +106,10 @@ Java_gnu_java_net_VMPlainDatagramSocketImpl_close(JNIEnv *env, jclass klass, job
  * Connects to the specified destination.
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_connect(JNIEnv *env, jclass klass, jobject obj, jobject addr, jint port)
+Java_gnu_java_net_VMPlainDatagramSocketImpl_connect(JNIEnv *env,
+						    jclass klass __attribute__ ((__unused__)),
+						    jobject obj,
+						    jobject addr, jint port)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
@@ -121,7 +128,10 @@ Java_gnu_java_net_VMPlainDatagramSocketImpl_connect(JNIEnv *env, jclass klass, j
  * variables. 
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_bind(JNIEnv *env, jclass klass, jobject obj, jint port, jobject addr)
+Java_gnu_java_net_VMPlainDatagramSocketImpl_bind(JNIEnv *env,
+						 jclass klass __attribute__ ((__unused__)),
+						 jobject obj,
+						 jint port, jobject addr)
 {
   assert(env!=NULL);
   assert((*env)!=NULL);
@@ -138,8 +148,11 @@ Java_gnu_java_net_VMPlainDatagramSocketImpl_bind(JNIEnv *env, jclass klass, jobj
  * This method sets the specified option for a socket
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_setOption(JNIEnv *env, jclass klass, jobject obj, 
-                                                jint option_id, jobject val)
+Java_gnu_java_net_VMPlainDatagramSocketImpl_setOption(JNIEnv *env,
+						      jclass klass __attribute__ ((__unused__)),
+						      jobject obj, 
+						      jint option_id,
+						      jobject val)
 {
   assert(env!=NULL);
   assert((*env)!=NULL);
@@ -156,8 +169,10 @@ Java_gnu_java_net_VMPlainDatagramSocketImpl_setOption(JNIEnv *env, jclass klass,
  * This method sets the specified option for a socket
  */
 JNIEXPORT jobject JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_getOption(JNIEnv *env, jclass klass, jobject obj, 
-                                                jint option_id)
+Java_gnu_java_net_VMPlainDatagramSocketImpl_getOption(JNIEnv *env,
+						      jclass klass __attribute__ ((__unused__)),
+						      jobject obj, 
+						      jint option_id)
 {
   assert(env!=NULL);
   assert((*env)!=NULL);
@@ -176,7 +191,7 @@ Java_gnu_java_net_VMPlainDatagramSocketImpl_getOption(JNIEnv *env, jclass klass,
  */
 JNIEXPORT void JNICALL
 Java_gnu_java_net_VMPlainDatagramSocketImpl_nativeReceive(JNIEnv     *env,
-                                                          jclass     klass,
+                                                          jclass     klass __attribute__ ((__unused__)),
                                                           jobject    obj,
                                                           jbyteArray arr,
                                                           jint       offset,
@@ -255,7 +270,7 @@ Java_gnu_java_net_VMPlainDatagramSocketImpl_nativeReceive(JNIEnv     *env,
  */
 JNIEXPORT void JNICALL
 Java_gnu_java_net_VMPlainDatagramSocketImpl_nativeSendTo(JNIEnv  *env,
-                                                         jclass  klass,
+                                                         jclass  klass __attribute__ ((__unused__)),
                                                          jobject obj, 
                                                          jobject addr,
                                                          jint    port,
@@ -302,8 +317,10 @@ Java_gnu_java_net_VMPlainDatagramSocketImpl_nativeSendTo(JNIEnv  *env,
  * Joins a multicast group
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_join(JNIEnv *env, jclass klass, jobject obj, 
-                                           jobject addr)
+Java_gnu_java_net_VMPlainDatagramSocketImpl_join(JNIEnv *env,
+						 jclass klass __attribute__ ((__unused__)),
+						 jobject obj, 
+						 jobject addr)
 {
 #ifndef WITHOUT_NETWORK
   jint netAddress;
@@ -356,8 +373,10 @@ Java_gnu_java_net_VMPlainDatagramSocketImpl_join(JNIEnv *env, jclass klass, jobj
  * Leaves a multicast group
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainDatagramSocketImpl_leave(JNIEnv *env, jclass klass, jobject obj, 
-                                            jobject addr)
+Java_gnu_java_net_VMPlainDatagramSocketImpl_leave(JNIEnv *env,
+						  jclass klass __attribute__ ((__unused__)),
+						  jobject obj, 
+						  jobject addr)
 {
 #ifndef WITHOUT_NETWORK
   jint netAddress;
diff --git a/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c b/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c
index 9aa2303c9..93284b3af 100644
--- a/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c
+++ b/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c
@@ -68,7 +68,9 @@ exception statement from your version. */
  * Creates a new stream or datagram socket
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_create(JNIEnv *env, jclass klass, jobject obj)
+Java_gnu_java_net_VMPlainSocketImpl_create(JNIEnv *env,
+					   jclass klass __attribute__ ((__unused__)),
+					   jobject obj)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
@@ -86,7 +88,9 @@ Java_gnu_java_net_VMPlainSocketImpl_create(JNIEnv *env, jclass klass, jobject ob
  * action as well.
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_close(JNIEnv *env, jclass klass, jobject obj)
+Java_gnu_java_net_VMPlainSocketImpl_close(JNIEnv *env,
+					  jclass klass __attribute__ ((__unused__)),
+					  jobject obj)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
@@ -103,8 +107,10 @@ Java_gnu_java_net_VMPlainSocketImpl_close(JNIEnv *env, jclass klass, jobject obj
  * Connects to the specified destination.
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_connect(JNIEnv *env, jclass klass, jobject obj, 
-                                          jobject addr, jint port)
+Java_gnu_java_net_VMPlainSocketImpl_connect(JNIEnv *env,
+					    jclass klass __attribute__ ((__unused__)),
+					    jobject obj, 
+					    jobject addr, jint port)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
@@ -123,8 +129,10 @@ Java_gnu_java_net_VMPlainSocketImpl_connect(JNIEnv *env, jclass klass, jobject o
  * variables. 
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_bind(JNIEnv *env, jclass klass, jobject obj, jobject addr,
-                                   jint port)
+Java_gnu_java_net_VMPlainSocketImpl_bind(JNIEnv *env,
+					 jclass klass __attribute__ ((__unused__)),
+					 jobject obj, jobject addr,
+					 jint port)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
@@ -142,7 +150,9 @@ Java_gnu_java_net_VMPlainSocketImpl_bind(JNIEnv *env, jclass klass, jobject obj,
  * connections allowed.
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_listen(JNIEnv *env, jclass klass, jobject obj, jint queuelen)
+Java_gnu_java_net_VMPlainSocketImpl_listen(JNIEnv *env,
+					   jclass klass __attribute__ ((__unused__)),
+					   jobject obj, jint queuelen)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
@@ -160,7 +170,9 @@ Java_gnu_java_net_VMPlainSocketImpl_listen(JNIEnv *env, jclass klass, jobject ob
  * object. Note that we assume this is a PlainSocketImpl just like us.
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_accept(JNIEnv *env, jclass klass, jobject obj, jobject impl)
+Java_gnu_java_net_VMPlainSocketImpl_accept(JNIEnv *env,
+					   jclass klass __attribute__ ((__unused__)),
+					   jobject obj, jobject impl)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
@@ -174,7 +186,9 @@ Java_gnu_java_net_VMPlainSocketImpl_accept(JNIEnv *env, jclass klass, jobject ob
 /*************************************************************************/
 
 JNIEXPORT jint JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_available(JNIEnv *env, jclass klass, jobject obj)
+Java_gnu_java_net_VMPlainSocketImpl_available(JNIEnv *env,
+					      jclass klass __attribute__ ((__unused__)),
+					      jobject obj)
 {
 #ifndef WITHOUT_NETWORK
   jclass   cls;
@@ -221,8 +235,10 @@ Java_gnu_java_net_VMPlainSocketImpl_available(JNIEnv *env, jclass klass, jobject
  * This method sets the specified option for a socket
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_setOption(JNIEnv *env,jclass klass, jobject obj, 
-                                        jint option_id, jobject val)
+Java_gnu_java_net_VMPlainSocketImpl_setOption(JNIEnv *env,
+					      jclass klass __attribute__ ((__unused__)),
+					      jobject obj, 
+					      jint option_id, jobject val)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
@@ -239,8 +255,10 @@ Java_gnu_java_net_VMPlainSocketImpl_setOption(JNIEnv *env,jclass klass, jobject
  * This method gets the specified option for a socket
  */
 JNIEXPORT jobject JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_getOption(JNIEnv *env, jclass klass, jobject obj, 
-                                        jint option_id)
+Java_gnu_java_net_VMPlainSocketImpl_getOption(JNIEnv *env,
+					      jclass klass __attribute__ ((__unused__)),
+					      jobject obj, 
+					      jint option_id)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
@@ -258,8 +276,10 @@ Java_gnu_java_net_VMPlainSocketImpl_getOption(JNIEnv *env, jclass klass, jobject
  * Reads a buffer from a remote host
  */
 JNIEXPORT jint JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_read(JNIEnv *env, jclass klass, jobject obj, jarray buf,
-                                   jint offset, jint len)
+Java_gnu_java_net_VMPlainSocketImpl_read(JNIEnv *env,
+					 jclass klass __attribute__ ((__unused__)),
+					 jobject obj, jarray buf,
+					 jint offset, jint len)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
@@ -277,8 +297,10 @@ Java_gnu_java_net_VMPlainSocketImpl_read(JNIEnv *env, jclass klass, jobject obj,
  * Writes a buffer to the remote host
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_write(JNIEnv *env, jclass klass, jobject obj, jarray buf,
-                                    jint offset, jint len)
+Java_gnu_java_net_VMPlainSocketImpl_write(JNIEnv *env,
+					  jclass klass __attribute__ ((__unused__)),
+					  jobject obj, jarray buf,
+					  jint offset, jint len)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
@@ -290,7 +312,9 @@ Java_gnu_java_net_VMPlainSocketImpl_write(JNIEnv *env, jclass klass, jobject obj
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_shutdownInput (JNIEnv * env, jclass klass, jobject this)
+Java_gnu_java_net_VMPlainSocketImpl_shutdownInput (JNIEnv * env,
+						   jclass klass __attribute__ ((__unused__)),
+						   jobject this)
 {
 #ifndef WITHOUT_NETWORK
   assert (env != NULL);
@@ -302,7 +326,9 @@ Java_gnu_java_net_VMPlainSocketImpl_shutdownInput (JNIEnv * env, jclass klass, j
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_shutdownOutput (JNIEnv * env, jclass klass, jobject this)
+Java_gnu_java_net_VMPlainSocketImpl_shutdownOutput (JNIEnv * env,
+						    jclass klass __attribute__ ((__unused__)),
+						    jobject this)
 {
 #ifndef WITHOUT_NETWORK
   assert (env != NULL);