[kaffe] CVS kaffe (doogie): Sparse NULL-constant fixes.

Kaffe CVS cvs-commits at kaffe.org
Sun Dec 19 18:38:58 PST 2004


PatchSet 5677 
Date: 2004/12/20 02:34:51
Author: doogie
Branch: HEAD
Tag: (none) 
Log:
Sparse NULL-constant fixes.

Members: 
	ChangeLog:1.3222->1.3223 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c:1.4->1.5 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c:1.3->1.4 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:1.7->1.8 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c:1.6->1.7 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c:1.3->1.4 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3222 kaffe/ChangeLog:1.3223
--- kaffe/ChangeLog:1.3222	Mon Dec 20 02:29:50 2004
+++ kaffe/ChangeLog	Mon Dec 20 02:34:51 2004
@@ -1,5 +1,15 @@
 2004-12-19  Adam Heath  <doogie at brainfood.com>
 
+	* libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c,
+	  libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,
+	  libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
+	  libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,
+	  libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c,
+	  libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c:
+	  Sparse NULL-constant fixes.
+
+2004-12-19  Adam Heath  <doogie at brainfood.com>
+
 	* kaffe/kaffevm/systems/unix-pthreads/lock-impl.c,
 	  kaffe/kaffevm/systems/unix-pthreads/signal.c,
 	  kaffe/kaffevm/systems/unix-pthreads/syscalls.c,
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c:1.4 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c:1.5
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c:1.4	Sat Nov 13 23:58:09 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	Mon Dec 20 02:34:53 2004
@@ -137,7 +137,7 @@
   pfont->desc = pango_font_description_new ();
   g_assert (pfont->desc != NULL);
 
-  family_name = (*env)->GetStringUTFChars(env, family_name_str, 0);
+  family_name = (*env)->GetStringUTFChars(env, family_name_str, NULL);
   g_assert (family_name != NULL);
   pango_font_description_set_family (pfont->desc, family_name);
   (*env)->ReleaseStringUTFChars(env, family_name_str, family_name);
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c:1.3 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c:1.4
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c:1.3	Wed Oct 27 22:15:43 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c	Mon Dec 20 02:34:53 2004
@@ -99,7 +99,7 @@
 
   ptr = NSA_GET_PTR (env, obj);
   
-  label = (*env)->GetStringUTFChars (env, item, 0);      
+  label = (*env)->GetStringUTFChars (env, item, NULL);      
 
   gdk_threads_enter ();
   gtk_combo_box_insert_text (GTK_COMBO_BOX (ptr), index, label);
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:1.7 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:1.8
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:1.7	Fri Oct 29 00:39:26 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	Mon Dec 20 02:34:54 2004
@@ -680,7 +680,7 @@
   jint *point;
 
   ptr = NSA_GET_PTR (env, obj);
-  point = (*env)->GetIntArrayElements (env, jpoint, 0);
+  point = (*env)->GetIntArrayElements (env, jpoint, NULL);
 
   gdk_threads_enter ();
 
@@ -710,7 +710,7 @@
 
   ptr = NSA_GET_PTR (env, obj);
 
-  dims = (*env)->GetIntArrayElements (env, jdims, 0);  
+  dims = (*env)->GetIntArrayElements (env, jdims, NULL);  
   dims[0] = dims[1] = 0;
 
   gdk_threads_enter ();
@@ -739,7 +739,7 @@
 
   ptr = NSA_GET_PTR (env, obj);
 
-  dims = (*env)->GetIntArrayElements (env, jdims, 0);  
+  dims = (*env)->GetIntArrayElements (env, jdims, NULL);  
   dims[0] = dims[1] = 0;
 
   gdk_threads_enter ();
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c:1.6 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c:1.7
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c:1.6	Wed Oct 27 21:23:40 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c	Mon Dec 20 02:34:54 2004
@@ -177,7 +177,7 @@
 
   ptr = NSA_GET_PTR (env, obj);
 
-  str = (*env)->GetStringUTFChars (env, directory, 0);
+  str = (*env)->GetStringUTFChars (env, directory, NULL);
 
   gdk_threads_enter ();
   gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER(ptr), str);
@@ -195,7 +195,7 @@
 
   ptr = NSA_GET_PTR (env, obj);
     
-  str = (*env)->GetStringUTFChars (env, filename, 0);
+  str = (*env)->GetStringUTFChars (env, filename, NULL);
      
   gdk_threads_enter ();
   gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (ptr), str);
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c:1.3 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c:1.4
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c:1.3	Sat Oct 16 17:24:18 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c	Mon Dec 20 02:34:54 2004
@@ -49,7 +49,7 @@
 
   NSA_SET_GLOBAL_REF (env, obj);
 
-  str = (*env)->GetStringUTFChars (env, text, 0);
+  str = (*env)->GetStringUTFChars (env, text, NULL);
 
   gdk_threads_enter ();
 
@@ -114,7 +114,7 @@
 
   ptr = NSA_GET_PTR (env, obj);
 
-  str = (*env)->GetStringUTFChars (env, text, 0);
+  str = (*env)->GetStringUTFChars (env, text, NULL);
 
   gdk_threads_enter ();
 
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c:1.1 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c:1.2
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c:1.1	Thu Jul 22 19:04:02 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c	Mon Dec 20 02:34:54 2004
@@ -64,7 +64,7 @@
   (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
    jintArray jdims)
 {
-  jint *dims = (*env)->GetIntArrayElements (env, jdims, 0);  
+  jint *dims = (*env)->GetIntArrayElements (env, jdims, NULL);  
 
   gdk_threads_enter ();
 
@@ -101,7 +101,7 @@
   jint *colors;
   GtkStyle *style;
 
-  colors = (*env)->GetIntArrayElements (env, jcolors, 0);
+  colors = (*env)->GetIntArrayElements (env, jcolors, NULL);
 
   gdk_threads_enter ();
 



More information about the kaffe mailing list