On Fri, 2007-03-30 at 01:36 +0200, Christian Thalinger wrote:
> On Thu, 2007-03-29 at 16:35 -0600, Tom Tromey wrote:
> > We discussed on irc but I thought the answer should be in the list
> > archives too.
> >
> > Annotation the argument with UNUSED. This is defined in config.h.
> > We already use this all over; gcc's "__attribute__ ((unused))" really
> > means "might or might not be used".
>
> Ok, I'll propose a new patch tomorrow.
Yeah, tomorrow :-) Anyways, here it is. Commit?
- twisti
---
Index: native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c,v
retrieving revision 1.8
diff -u -3 -p -r1.8 gnu_java_nio_charset_iconv_IconvDecoder.c
--- native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c 7 Nov
2005 22:20:39 -0000 1.8
+++ native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c 4 Apr
2007 11:35:40 -0000
@@ -48,11 +48,13 @@ exception statement from your version. *
#include "gnu_java_nio_charset_iconv_IconvDecoder.h"
+#if defined(HAVE_ICONV)
static void createRawData (JNIEnv * env, jobject obj, void *ptr);
static void *getData (JNIEnv * env, jobject obj);
static jfieldID infid = NULL;
static jfieldID outfid = NULL;
+#endif
/* Union used for type punning. */
union char_union
@@ -63,9 +65,9 @@ union char_union
};
JNIEXPORT void JNICALL
-Java_gnu_java_nio_charset_iconv_IconvDecoder_openIconv (JNIEnv * env,
- jobject obj,
- jstring jname)
+Java_gnu_java_nio_charset_iconv_IconvDecoder_openIconv (JNIEnv * env UNUSED,
+ jobject obj UNUSED,
+ jstring jname UNUSED)
{
#if defined(HAVE_ICONV)
iconv_t iconv_object;
@@ -107,12 +109,14 @@ Java_gnu_java_nio_charset_iconv_IconvDec
}
JNIEXPORT jint JNICALL
-Java_gnu_java_nio_charset_iconv_IconvDecoder_decode (JNIEnv * env,
- jobject obj,
- jbyteArray inArr,
- jcharArray outArr,
- jint posIn, jint remIn,
- jint posOut, jint remOut)
+Java_gnu_java_nio_charset_iconv_IconvDecoder_decode (JNIEnv * env UNUSED,
+ jobject obj UNUSED,
+ jbyteArray inArr UNUSED,
+ jcharArray outArr UNUSED,
+ jint posIn UNUSED,
+ jint remIn UNUSED,
+ jint posOut UNUSED,
+ jint remOut UNUSED)
{
#if defined(HAVE_ICONV)
iconv_t iconv_object = getData (env, obj);
@@ -158,8 +162,8 @@ Java_gnu_java_nio_charset_iconv_IconvDec
}
JNIEXPORT void JNICALL
-Java_gnu_java_nio_charset_iconv_IconvDecoder_closeIconv (JNIEnv * env,
- jobject obj)
+Java_gnu_java_nio_charset_iconv_IconvDecoder_closeIconv (JNIEnv * env UNUSED,
+ jobject obj UNUSED)
{
#if defined(HAVE_ICONV)
iconv_t iconv_object;
@@ -169,6 +173,7 @@ Java_gnu_java_nio_charset_iconv_IconvDec
}
+#if defined(HAVE_ICONV)
static void
createRawData (JNIEnv * env, jobject obj, void *ptr)
{
@@ -199,3 +204,5 @@ getData (JNIEnv * env, jobject obj)
return JCL_GetRawData(env, data);
}
+#endif
+
Index: native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c,v
retrieving revision 1.8
diff -u -3 -p -r1.8 gnu_java_nio_charset_iconv_IconvEncoder.c
--- native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c 5 Aug
2005 17:12:52 -0000 1.8
+++ native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c 4 Apr
2007 11:35:40 -0000
@@ -48,11 +48,14 @@ exception statement from your version. *
#include "gnu_java_nio_charset_iconv_IconvEncoder.h"
+
+#if defined(HAVE_ICONV)
static void createRawData (JNIEnv * env, jobject obj, void *ptr);
static void *getData (JNIEnv * env, jobject obj);
static jfieldID infid = NULL;
static jfieldID outfid = NULL;
+#endif
/* Union used for type punning. */
union char_union
@@ -63,9 +66,9 @@ union char_union
};
JNIEXPORT void JNICALL
-Java_gnu_java_nio_charset_iconv_IconvEncoder_openIconv (JNIEnv * env,
- jobject obj,
- jstring jname)
+Java_gnu_java_nio_charset_iconv_IconvEncoder_openIconv (JNIEnv * env UNUSED,
+ jobject obj UNUSED,
+ jstring jname UNUSED)
{
#if defined(HAVE_ICONV)
iconv_t iconv_object;
@@ -107,12 +110,14 @@ Java_gnu_java_nio_charset_iconv_IconvEnc
}
JNIEXPORT jint JNICALL
-Java_gnu_java_nio_charset_iconv_IconvEncoder_encode (JNIEnv * env,
- jobject obj,
- jcharArray inArr,
- jbyteArray outArr,
- jint posIn, jint remIn,
- jint posOut, jint remOut)
+Java_gnu_java_nio_charset_iconv_IconvEncoder_encode (JNIEnv * env UNUSED,
+ jobject obj UNUSED,
+ jcharArray inArr UNUSED,
+ jbyteArray outArr UNUSED,
+ jint posIn UNUSED,
+ jint remIn UNUSED,
+ jint posOut UNUSED,
+ jint remOut UNUSED)
{
#if defined(HAVE_ICONV)
iconv_t iconv_object = getData (env, obj);
@@ -158,8 +163,8 @@ Java_gnu_java_nio_charset_iconv_IconvEnc
}
JNIEXPORT void JNICALL
-Java_gnu_java_nio_charset_iconv_IconvEncoder_closeIconv (JNIEnv * env,
- jobject obj)
+Java_gnu_java_nio_charset_iconv_IconvEncoder_closeIconv (JNIEnv * env UNUSED,
+ jobject obj UNUSED)
{
#if defined(HAVE_ICONV)
iconv_t iconv_object;
@@ -169,6 +174,7 @@ Java_gnu_java_nio_charset_iconv_IconvEnc
}
+#if defined(HAVE_ICONV)
static void
createRawData (JNIEnv * env, jobject obj, void *ptr)
{
@@ -199,3 +205,4 @@ getData (JNIEnv * env, jobject obj)
return JCL_GetRawData(env, data);
}
+#endif
