The attached patch fixes a number of issues (mostly unused
variables and ignored return variables) which raise warnings
with gcc 4.6 and cause a build failure if -Werror is also enabled.
ChangeLog:
2011-06-27 Andrew John Hughes <[email protected]>
Fix issues with building with -Werror and gcc 4.6.
* native/jni/gtk-peer/GtkDragSourceContextPeer.c:
(Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeSetCursor):
Remove unused ptr variable and mark env as unused.
(connect_signals_for_widget(GtkWidget*)): Mark w unused and don't set
it.
(Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeStartDrag):
Remove unused ptr variable.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c:
(Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState):
Remove unused width and height variables.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c:
(Java_gnu_java_awt_peer_gtk_GdkRobotPeer_mouseMove):
Check result of XTestFakeMotionEvent call.
(Java_gnu_java_awt_peer_gtk_GdkRobotPeer_mousePress): Likewise for
XTestFakeButtonEvent call.
(Java_gnu_java_awt_peer_gtk_GdkRobotPeer_mouseRelease): Likewise.
(Java_gnu_java_awt_peer_gtk_GdkRobotPeer_keyPress): Use g_message
instead of deprecated g_printerr. Check result of XTestFakeKeyEvent.
(Java_gnu_java_awt_peer_gtk_GdkRobotPeer_keyRelease): Likewise.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c:
(Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup):
Completely disable code to attach parent, including use of ptr2
and parent argument, and reinstate original FIXME to explain why.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:
(Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels):
Remove unused depth variable.
* native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c,
(Java_gnu_javax_sound_midi_alsa_AlsaPortDevice_run_1receiver_1thread_1):
Check return values and throw an InternalError if a problem occurs.
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37
Index: native/jni/gtk-peer/GtkDragSourceContextPeer.c
===================================================================
RCS file:
/sources/classpath/classpath/native/jni/gtk-peer/GtkDragSourceContextPeer.c,v
retrieving revision 1.7
diff -u -u -r1.7 GtkDragSourceContextPeer.c
--- native/jni/gtk-peer/GtkDragSourceContextPeer.c 25 Apr 2007 14:53:03
-0000 1.7
+++ native/jni/gtk-peer/GtkDragSourceContextPeer.c 26 Jun 2011 14:34:07
-0000
@@ -99,9 +99,8 @@
JNIEXPORT void JNICALL
Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeSetCursor
- (JNIEnv *env, jobject obj, jint type)
+ (JNIEnv *env __attribute__((unused)), jobject obj, jint type)
{
- void *ptr;
GdkWindow *win;
GdkCursorType gdk_cursor_type;
GdkCursor *gdk_cursor;
@@ -109,7 +108,6 @@
gdk_threads_enter ();
javaObj = obj;
- ptr = gtkpeer_get_global_ref (env, obj);
switch (type)
{
@@ -230,10 +228,9 @@
}
static void
-connect_signals_for_widget (GtkWidget *w)
+connect_signals_for_widget (GtkWidget *w __attribute__((unused)))
{
/* FIXME: Not implemented. */
- w = NULL;
}
JNIEXPORT void JNICALL
@@ -257,7 +254,6 @@
(JNIEnv *env, jobject obj, jobject img, jint x, jint y, jint act,
jstring target)
{
- void *ptr;
const gchar *data;
GtkTargetEntry tar[1];
GdkEvent *event;
@@ -268,7 +264,6 @@
gdk_threads_enter ();
javaObj = obj;
- ptr = gtkpeer_get_global_ref (env, obj);
data = (*env)->GetStringUTFChars (env, target, NULL);
tar[0].target = (gchar *) data;
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
===================================================================
RCS file:
/sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,v
retrieving revision 1.22
diff -u -u -r1.22 gnu_java_awt_peer_gtk_ComponentGraphics.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c 11 Sep
2007 09:48:50 -0000 1.22
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c 26 Jun
2011 14:34:07 -0000
@@ -121,7 +121,6 @@
{
GdkDrawable *drawable;
GtkWidget *widget;
- int width, height;
cairo_t *cr;
void *ptr;
@@ -136,9 +135,6 @@
drawable = widget->window;
g_assert (drawable != NULL);
- width = widget->allocation.width;
- height = widget->allocation.height;
-
cr = gdk_cairo_create(drawable);
g_assert(cr != NULL);
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c
===================================================================
RCS file:
/sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c,v
retrieving revision 1.7
diff -u -u -r1.7 gnu_java_awt_peer_gtk_GdkRobotPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c 11 Sep 2007
09:48:50 -0000 1.7
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c 26 Jun 2011
14:34:07 -0000
@@ -120,6 +120,8 @@
result = XTestFakeMotionEvent (xdisplay,
-1,
x, y, CurrentTime);
+ if (result)
+ g_warning("XTestFakeMotionEvent returned %d\n", result);
XFlush (xdisplay);
@@ -153,6 +155,8 @@
result = XTestFakeButtonEvent (xdisplay,
awt_button_mask_to_num (buttons),
True, CurrentTime);
+ if (result)
+ g_warning("XTestFakeButtonEvent returned %d\n", result);
XFlush (xdisplay);
@@ -185,6 +189,8 @@
result = XTestFakeButtonEvent (xdisplay,
awt_button_mask_to_num (buttons),
False, CurrentTime);
+ if (result)
+ g_warning("XTestFakeButtonEvent returned %d\n", result);
XFlush (xdisplay);
@@ -275,7 +281,7 @@
&n_keys))
{
/* No matching keymap entry was found. */
- g_printerr ("No matching keymap entries were found\n");
+ g_message ("No matching keymap entries were found\n");
gdk_threads_leave ();
return;
}
@@ -287,6 +293,8 @@
result = XTestFakeKeyEvent (xdisplay,
keymap_keys[0].keycode,
True, CurrentTime);
+ if (result)
+ g_warning("XTestFakeKeyEvent returned %d\n", result);
g_free (keymap_keys);
@@ -330,7 +338,7 @@
&n_keys))
{
/* No matching keymap entry was found. */
- g_printerr ("No matching keymap entries were found\n");
+ g_message ("No matching keymap entries were found\n");
gdk_threads_leave ();
return;
}
@@ -342,6 +350,8 @@
result = XTestFakeKeyEvent (xdisplay,
keymap_keys[0].keycode,
False, CurrentTime);
+ if (result)
+ g_warning("XTestFakeKeyEvent returned %d\n", result);
g_free (keymap_keys);
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
===================================================================
RCS file:
/sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,v
retrieving revision 1.15
diff -u -u -r1.15 gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c 25 Apr
2007 14:53:04 -0000 1.15
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c 26 Jun
2011 14:34:07 -0000
@@ -83,20 +83,25 @@
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup
- (JNIEnv *env, jobject obj, jobject parent)
+ (JNIEnv *env, jobject obj, jobject parent __attribute__((unused)))
{
- void *ptr1, *ptr2;
+ void *ptr1;
GtkMenu *menu;
+#if 0
+ void *ptr2;
+#endif
gdk_threads_enter ();
ptr1 = gtkpeer_get_widget (env, obj);
- ptr2 = gtkpeer_get_widget (env, parent);
menu = GTK_MENU (GTK_MENU_ITEM (ptr1)->submenu);
gtk_menu_set_accel_group (menu, gtk_accel_group_new ());
/* FIXME: update this to use GTK-2.4 GtkActions. */
+ // FIXME: _gtk_accel_group_attach is a GTK-private function, so
+ // we'll need a different approach here
#if 0
+ ptr2 = gtkpeer_get_widget (env, parent);
_gtk_accel_group_attach (gtk_menu_get_accel_group (menu),
G_OBJECT (gtk_widget_get_toplevel (ptr2)));
#endif
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
===================================================================
RCS file:
/sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c,v
retrieving revision 1.10
diff -u -u -r1.10 gnu_java_awt_peer_gtk_GtkVolatileImage.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c 11 Sep
2007 09:48:50 -0000 1.10
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c 26 Jun
2011 14:34:07 -0000
@@ -110,7 +110,7 @@
GdkPixmap *pixmap;
GdkPixbuf *pixbuf;
jintArray jpixels;
- int width, height, depth, size;
+ int width, height, size;
jclass cls;
jfieldID field;
guchar *pixels;
@@ -129,8 +129,6 @@
gdk_threads_enter();
- /* get depth in bytes */
- depth = gdk_drawable_get_depth( pixmap ) >> 3;
size = width * height;
jpixels = (*env)->NewIntArray ( env, size );
jpixdata = (*env)->GetIntArrayElements (env, jpixels, NULL);
Index: native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c
===================================================================
RCS file:
/sources/classpath/classpath/native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c,v
retrieving revision 1.2
diff -u -u -r1.2 gnu_javax_sound_midi_alsa_AlsaPortDevice.c
--- native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c 4 Oct
2005 12:24:08 -0000 1.2
+++ native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c 26 Jun
2011 14:34:07 -0000
@@ -41,6 +41,7 @@
#include <gnu_javax_sound_midi_alsa_AlsaPortDevice.h>
#include <unistd.h>
+#include <jcl.h>
#include <alsa/asoundlib.h>
JNIEXPORT void JNICALL
@@ -59,11 +60,15 @@
snd_seq_port_subscribe_alloca (&subs);
rc = snd_seq_open (&seq, "default", SND_SEQ_OPEN_DUPLEX, SND_SEQ_NONBLOCK);
+ if (rc < 0)
+ JCL_ThrowException (env, "java/lang/InternalError", snd_strerror (rc));
snd_seq_port_info_set_capability (pinfo, SND_SEQ_PORT_CAP_WRITE);
snd_seq_port_info_set_type (pinfo, SND_SEQ_PORT_TYPE_MIDI_GENERIC);
rc = snd_seq_create_port (seq, pinfo);
+ if (rc < 0)
+ JCL_ThrowException (env, "java/lang/InternalError", snd_strerror (rc));
sender.client = (int) client;
sender.port = (int) port;
@@ -73,6 +78,8 @@
snd_seq_port_subscribe_set_sender (subs, &sender);
snd_seq_port_subscribe_set_dest (subs, &dest);
rc = snd_seq_subscribe_port(seq, subs);
+ if (rc < 0)
+ JCL_ThrowException (env, "java/lang/InternalError", snd_strerror (rc));
{
int npfd;
