This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[patch] [gui] warning patrol in gtk-peer
- From: Andreas Tobler <toa at pop dot agri dot ch>
- To: Java Patches <java-patches at gcc dot gnu dot org>
- Date: Thu, 21 Oct 2004 18:00:23 +0200
- Subject: [patch] [gui] warning patrol in gtk-peer
Hello all,
the following patch cleans up a few warnings from unused variables.
ok for gui?
Andreas
2004-10-21 Andreas Tobler <a.tobler@schweiz.ch>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c
(Java_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_nativeRun):
Mark unused arguments unused.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c
(Java_gnu_java_awt_peer_gtk_GdkGlyphVector_initState),
(Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setGlyphCodes),
(Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphCharIndex),
(Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphIsHorizontal):
Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c
(Java_gnu_java_awt_peer_gtk_GdkFontMetrics_getPeerFontMetrics),
(Java_gnu_java_awt_peer_gtk_GdkFontMetrics_getPeerTextMetrics):
Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
(Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFilenameFilter):
Likewise.
(filenameFilterCallback): Remove unused var.
(handle_response): Initialize str_filename.
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c 31 Jul 2004 13:28:11 -0000 1.1.2.1
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c 21 Oct 2004 15:56:56 -0000
@@ -48,8 +48,7 @@
*
*/
JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_nativeRun(JNIEnv *gdk_env, jobject lcl_obj,
- jlong funcAddr, jlong funcArg)
+Java_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_nativeRun(JNIEnv *gdk_env __attribute__((unused)), jobject lcl_obj __attribute__((unused)), jlong funcAddr, jlong funcArg)
{
/* Convert the function's address back into a pointer to a C function. */
void *(*funcPtr)(void *) = (void *(*)(void *)) funcAddr;
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c,v
retrieving revision 1.2.12.4
diff -u -r1.2.12.4 gnu_java_awt_peer_gtk_GdkGlyphVector.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c 9 Oct 2004 08:15:44 -0000 1.2.12.4
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c 21 Oct 2004 15:56:57 -0000
@@ -58,8 +58,8 @@
NSA_GV_INIT (env, clazz);
}
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_initState
- (JNIEnv *env, jobject self, jobject font, jobject ctx)
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_initState
+ (JNIEnv *env, jobject self, jobject font, jobject ctx __attribute__ ((unused)))
{
struct glyphvec *vec = NULL;
struct peerfont *pfont = NULL;
@@ -330,8 +330,8 @@
}
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setGlyphCodes
- (JNIEnv *env, jobject self, jintArray codes)
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setGlyphCodes
+ (JNIEnv *env, jobject self, jintArray codes __attribute__ ((unused)))
{
struct glyphvec *vec = NULL;
@@ -398,8 +398,8 @@
}
-JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphCharIndex
- (JNIEnv *env, jobject self, jint idx)
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphCharIndex
+(JNIEnv *env __attribute__ ((unused)), jobject self __attribute__ ((unused)), jint idx)
{
/*
FIXME: this is not correct, rather it assumes a (broken) 1:1
@@ -625,7 +625,7 @@
JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphIsHorizontal
- (JNIEnv *env, jobject self, jint idx)
+(JNIEnv *env, jobject self, jint idx __attribute__ ((unused)))
{
struct glyphvec *vec = NULL;
PangoDirection dir;
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c,v
retrieving revision 1.3.8.3
diff -u -r1.3.8.3 gnu_java_awt_peer_gtk_GdkFontMetrics.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c 4 Oct 2004 16:45:49 -0000 1.3.8.3
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c 21 Oct 2004 15:56:57 -0000
@@ -42,7 +42,7 @@
#include <gdk/gdkx.h>
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_getPeerFontMetrics
- (JNIEnv *env, jclass clazz, jobject java_font, jdoubleArray java_metrics)
+ (JNIEnv *env, jclass clazz __attribute__ ((unused)), jobject java_font, jdoubleArray java_metrics)
{
struct peerfont *pfont = NULL;
jdouble *native_metrics = NULL;
@@ -75,7 +75,7 @@
}
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_getPeerTextMetrics
- (JNIEnv *env, jclass clazz, jobject java_font, jstring str, jdoubleArray java_metrics)
+ (JNIEnv *env, jclass clazz __attribute__ ((unused)), jobject java_font, jstring str, jdoubleArray java_metrics)
{
struct peerfont *pfont = NULL;
const char *cstr = NULL;
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,v
retrieving revision 1.4.8.6
diff -u -r1.4.8.6 gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c 7 Oct 2004 22:11:59 -0000 1.4.8.6
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c 21 Oct 2004 15:56:57 -0000
@@ -130,7 +130,6 @@
gboolean filenameFilterCallback (const GtkFileFilterInfo *filter_info,
gpointer obj)
{
- gchar* dirname;
jclass cx;
jmethodID id;
jstring *filename;
@@ -151,7 +150,7 @@
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFilenameFilter
- (JNIEnv *env, jobject obj, jobject filter_obj)
+ (JNIEnv *env, jobject obj, jobject filter_obj __attribute__((unused)))
{
void *ptr;
GtkFileFilter *filter;
@@ -220,7 +219,7 @@
static jmethodID disposeID;
void *ptr;
G_CONST_RETURN gchar *fileName;
- jstring str_fileName;
+ jstring str_fileName = NULL;
/* We only need this for the case when the user closed the window,
or clicked ok or cancel. */