Hi, This patch gets rid of most warnings and removes an unused return and a variable from the new gtk-peer code.
2006-05-29 Mark Wielaard <[EMAIL PROTECTED]>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_init): Mark unused
arguments.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
(Java_gnu_java_awt_peer_gtk_CairoSurface_setPixels): Declare size
early. Remove unused return statement in void function.
(Java_gnu_java_awt_peer_gtk_CairoSurface_newCairoContext): Declare
ptr early.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
(Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender): Mark
unused arguments.
(Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState): Likewise.
(Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing):
Likewise.
(Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing):
Likewise.
We are not totally warning free yet. There are some pointer conversions
and pointer/integer comparisons done that confuse the compiler.
Cheers,
Mark
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,v
retrieving revision 1.1
diff -u -1 -0 -r1.1 gnu_java_awt_peer_gtk_CairoGraphics2D.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c 29 May 2006 16:14:59 -0000 1.1
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c 29 May 2006 17:42:50 -0000
@@ -76,21 +76,23 @@
struct cairographics2d *gr = getPointer(env, cairographics2dobj);
g_assert(gr != NULL);
return gr->cr;
}
/**
* Allocates the cairographics2d structure.
*/
JNIEXPORT jlong JNICALL
Java_gnu_java_awt_peer_gtk_CairoGraphics2D_init
- (JNIEnv *env, jobject obj, jlong cairo_t_pointer)
+ (JNIEnv *env __attribute__ ((unused)),
+ jobject obj __attribute__ ((unused)),
+ jlong cairo_t_pointer)
{
struct cairographics2d *g = NULL;
g_assert( cairo_t_pointer != NULL);
g = (struct cairographics2d *) g_malloc (sizeof (struct cairographics2d));
g_assert (g != NULL);
memset (g, 0, sizeof(struct cairographics2d));
g->cr = (cairo_t *)cairo_t_pointer;
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c,v
retrieving revision 1.1
diff -u -1 -0 -r1.1 gnu_java_awt_peer_gtk_CairoSurface.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c 29 May 2006 16:14:59 -0000 1.1
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c 29 May 2006 17:42:50 -0000
@@ -145,38 +145,38 @@
}
/**
* Sets all pixels by an array.
*/
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_CairoSurface_setPixels
(JNIEnv *env, jobject obj, jintArray jpixels)
{
jint *pixeldata, *jpixdata, i;
+ int size;
pixeldata = (jint *)getNativeObject(env, obj, BUFFER);
g_assert(pixeldata != NULL);
jpixdata = (*env)->GetIntArrayElements (env, jpixels, NULL);
- int size = (*env)->GetArrayLength( env, jpixels );
+ size = (*env)->GetArrayLength( env, jpixels );
memcpy (pixeldata, jpixdata, size);
#ifndef WORDS_BIGENDIAN
/* convert pixels from 0xBBGGRRAA to 0xAARRGGBB */
for (i = 0; i < size; ++i)
{
jpixdata[i] = SWAPU32 ((unsigned)jpixdata[i]);
}
#endif
(*env)->ReleaseIntArrayElements (env, jpixels, jpixdata, 0);
- return jpixels;
}
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_CairoSurface_drawSurface
(JNIEnv *env, jobject obj, jobject context, jdoubleArray java_matrix)
{
cairo_t *cr;
jdouble *native_matrix = NULL;
cairo_surface_t* surface = (cairo_surface_t *)getNativeObject(env, obj, SURFACE);
g_assert(surface != NULL);
@@ -207,22 +207,23 @@
(*env)->ReleaseDoubleArrayElements (env, java_matrix, native_matrix, 0);
}
/**
* Create and return a cairo context for drawing to the surface.
*/
JNIEXPORT jlong JNICALL
Java_gnu_java_awt_peer_gtk_CairoSurface_newCairoContext (JNIEnv *env, jobject obj)
{
cairo_surface_t* surface = (cairo_surface_t *)getNativeObject(env, obj, SURFACE);
+ cairo_t *ptr;
g_assert(surface != NULL);
- cairo_t *ptr = cairo_create(surface);
+ ptr = cairo_create(surface);
g_assert(ptr != NULL);
return (jlong)ptr;
}
/**
* copyArea.
*/
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative (JNIEnv *env, jobject obj,
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,v
retrieving revision 1.1
diff -u -1 -0 -r1.1 gnu_java_awt_peer_gtk_ComponentGraphics.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c 29 May 2006 16:14:59 -0000 1.1
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c 29 May 2006 17:42:50 -0000
@@ -67,32 +67,33 @@
*draw = *win;
gdk_window_get_internal_paint_info (*win, draw, 0, 0);
g_object_ref (*draw);
/* FIXME: Unref this. */
}
/**
* Returns whether the XRender extension is supported
*/
JNIEXPORT jboolean JNICALL
-Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender (JNIEnv *env, jclass cls)
+Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender
+ (JNIEnv *env __attribute__ ((unused)), jclass cls __attribute__ ((unused)))
{
int ev = 0, err = 0;
if( XRenderQueryExtension (GDK_DISPLAY (), &ev, &err) )
return JNI_TRUE;
return JNI_FALSE;
}
JNIEXPORT jlong JNICALL
-Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState (JNIEnv *env, jobject obj,
- jobject peer)
+Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState
+ (JNIEnv *env, jobject obj __attribute__ ((unused)), jobject peer)
{
Drawable draw;
Display * dpy;
Visual * vis;
GdkDrawable *drawable;
cairo_surface_t *surface;
GdkWindow *win;
GtkWidget *widget = NULL;
void *ptr = NULL;
int width, height;
@@ -128,21 +129,23 @@
cr = cairo_create (surface);
g_assert(cr != NULL);
gdk_threads_leave();
return (jlong)cr;
}
JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing (JNIEnv *env, jobject obj)
+Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing
+ (JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused)))
{
gdk_threads_enter();
}
JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing (JNIEnv *env, jobject obj)
+Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing
+ (JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused)))
{
gdk_threads_leave();
}
signature.asc
Description: This is a digitally signed message part
