[kaffe] CVS kaffe (doogie): s/0/NULL/.

Kaffe CVS cvs-commits at kaffe.org
Tue May 31 14:24:35 PDT 2005


PatchSet 6605 
Date: 2005/05/31 21:18:31
Author: doogie
Branch: HEAD
Tag: (none) 
Log:
s/0/NULL/.

Members: 
	ChangeLog:1.4131->1.4132 
	kaffe/kaffevm/jni/jni.c:1.28->1.29 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c:1.3->1.4 
	libraries/clib/fdlibm/dtoa.c:1.2->1.3 
	libraries/clib/fdlibm/mprec.c:1.2->1.3 
	libraries/clib/fdlibm/strtod.c:1.2->1.3 
	libraries/clib/nio/gnu_java_nio_VMSelector.c:1.13->1.14 
	libraries/clib/nio/gnu_java_nio_charset_iconv_IconvDecoder.c:1.3->1.4 
	libraries/clib/nio/gnu_java_nio_charset_iconv_IconvEncoder.c:1.3->1.4 
	libraries/clib/nio/java_nio_VMDirectByteBuffer.c:1.7->1.8 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4131 kaffe/ChangeLog:1.4132
--- kaffe/ChangeLog:1.4131	Tue May 31 20:18:35 2005
+++ kaffe/ChangeLog	Tue May 31 21:18:31 2005
@@ -1,5 +1,17 @@
 2005-05-31  Adam Heath  <doogie at brainfood.com>
 
+	* kaffe/kaffevm/jni/jni.c,
+	  libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c,
+	  libraries/clib/fdlibm/dtoa.c, libraries/clib/fdlibm/mprec.c,
+	  libraries/clib/fdlibm/strtod.c,
+	  libraries/clib/nio/gnu_java_nio_VMSelector.c,
+	  libraries/clib/nio/gnu_java_nio_charset_iconv_IconvDecoder.c,
+	  libraries/clib/nio/gnu_java_nio_charset_iconv_IconvEncoder.c,
+	  libraries/clib/nio/java_nio_VMDirectByteBuffer.c:
+	  s/0/NULL/.
+
+2005-05-31  Adam Heath  <doogie at brainfood.com>
+
 	* scripts/GCCWarning.pm: Few more warnings added.
 
 2005-05-31  Adam Heath  <doogie at brainfood.com>
Index: kaffe/kaffe/kaffevm/jni/jni.c
diff -u kaffe/kaffe/kaffevm/jni/jni.c:1.28 kaffe/kaffe/kaffevm/jni/jni.c:1.29
--- kaffe/kaffe/kaffevm/jni/jni.c:1.28	Mon May 30 21:16:03 2005
+++ kaffe/kaffe/kaffevm/jni/jni.c	Tue May 31 21:18:29 2005
@@ -93,7 +93,7 @@
 
 	for (idx = 0; idx < table->frameSize; idx++) {
 		if (table->objects[idx] == obj) {
-			table->objects[idx] = 0;
+			table->objects[idx] = NULL;
 			table->used--;
 			return;
 		}
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c:1.3 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c:1.4
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c:1.3	Thu Jan 13 04:54:27 2005
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c	Tue May 31 21:18:30 2005
@@ -196,7 +196,7 @@
 
   ptr = NSA_GET_PTR (env, obj);
 
-  pixels = (*env)->GetIntArrayElements (env, pixelArray, 0);
+  pixels = (*env)->GetIntArrayElements (env, pixelArray, NULL);
   pixels_length = (*env)->GetArrayLength (env, pixelArray);
 
   data = malloc (sizeof (guchar) * pixels_length);
Index: kaffe/libraries/clib/fdlibm/dtoa.c
diff -u kaffe/libraries/clib/fdlibm/dtoa.c:1.2 kaffe/libraries/clib/fdlibm/dtoa.c:1.3
--- kaffe/libraries/clib/fdlibm/dtoa.c:1.2	Mon May 30 09:24:02 2005
+++ kaffe/libraries/clib/fdlibm/dtoa.c	Tue May 31 21:18:30 2005
@@ -265,7 +265,7 @@
       ptr->_result->_k = ptr->_result_k;
       ptr->_result->_maxwds = 1 << ptr->_result_k;
       Bfree (ptr, ptr->_result);
-      ptr->_result = 0;
+      ptr->_result = NULL;
     }
 
   if (word0 (d) & Sign_bit)
@@ -499,7 +499,7 @@
       word0 (eps) -= (P - 1) * Exp_msk1;
       if (ilim == 0)
 	{
-	  S = mhi = 0;
+	  S = mhi = NULL;
 	  d.d -= 5.;
 	  if (d.d > eps.d)
 	    goto one_digit;
@@ -570,7 +570,7 @@
       ds = tens[k];
       if (ndigits < 0 && ilim <= 0)
 	{
-	  S = mhi = 0;
+	  S = mhi = NULL;
 	  if (ilim < 0 || d.d <= 5 * ds)
 	    goto no_digits;
 	  goto one_digit;
@@ -613,7 +613,7 @@
 
   m2 = b2;
   m5 = b5;
-  mhi = mlo = 0;
+  mhi = mlo = NULL;
   if (leftright)
     {
       if (mode < 2)
Index: kaffe/libraries/clib/fdlibm/mprec.c
diff -u kaffe/libraries/clib/fdlibm/mprec.c:1.2 kaffe/libraries/clib/fdlibm/mprec.c:1.3
--- kaffe/libraries/clib/fdlibm/mprec.c:1.2	Sun May 22 15:51:52 2005
+++ kaffe/libraries/clib/fdlibm/mprec.c	Tue May 31 21:18:30 2005
@@ -423,7 +423,7 @@
     {
       /* first time */
       p5 = ptr->_p5s = i2b (ptr, 625);
-      p5->_next = 0;
+      p5->_next = NULL;
     }
   for (;;)
     {
@@ -438,7 +438,7 @@
       if (!(p51 = p5->_next))
 	{
 	  p51 = p5->_next = mult (ptr, p5, p5);
-	  p51->_next = 0;
+	  p51->_next = NULL;
 	}
       p5 = p51;
     }
Index: kaffe/libraries/clib/fdlibm/strtod.c
diff -u kaffe/libraries/clib/fdlibm/strtod.c:1.2 kaffe/libraries/clib/fdlibm/strtod.c:1.3
--- kaffe/libraries/clib/fdlibm/strtod.c:1.2	Mon May 30 09:24:02 2005
+++ kaffe/libraries/clib/fdlibm/strtod.c	Tue May 31 21:18:30 2005
@@ -273,7 +273,7 @@
   rv.d = y;
   if (k > 9)
     rv.d = tens[k - 9] * rv.d + z;
-  bd0 = 0;
+  bd0 = NULL;
   if (nd <= DBL_DIG
 #ifndef RND_PRODQUOT
       && FLT_ROUNDS == 1
Index: kaffe/libraries/clib/nio/gnu_java_nio_VMSelector.c
diff -u kaffe/libraries/clib/nio/gnu_java_nio_VMSelector.c:1.13 kaffe/libraries/clib/nio/gnu_java_nio_VMSelector.c:1.14
--- kaffe/libraries/clib/nio/gnu_java_nio_VMSelector.c:1.13	Mon Apr 18 17:46:44 2005
+++ kaffe/libraries/clib/nio/gnu_java_nio_VMSelector.c	Tue May 31 21:18:30 2005
@@ -72,7 +72,7 @@
 helper_put_filedescriptors (JNIEnv * env, jintArray fdArray, fd_set * fds,
 			    int *max_fd)
 {
-  jint *tmpFDArray = (*env)->GetIntArrayElements (env, fdArray, 0);
+  jint *tmpFDArray = (*env)->GetIntArrayElements (env, fdArray, NULL);
   int size = (*env)->GetArrayLength (env, fdArray);
   int index, fd;
 
@@ -93,7 +93,7 @@
 void
 helper_get_filedescriptors (JNIEnv * env, jintArray * fdArray, fd_set * fds)
 {
-  jint *tmpFDArray = (*env)->GetIntArrayElements (env, fdArray, 0);
+  jint *tmpFDArray = (*env)->GetIntArrayElements (env, fdArray, NULL);
   int size = (*env)->GetArrayLength (env, fdArray);
   int index, fd;
 
@@ -108,7 +108,7 @@
 void
 helper_reset (JNIEnv * env, jintArray * fdArray)
 {
-  jint *tmpFDArray = (*env)->GetIntArrayElements (env, fdArray, 0);
+  jint *tmpFDArray = (*env)->GetIntArrayElements (env, fdArray, NULL);
   int size = (*env)->GetArrayLength (env, fdArray);
   int index;
 
Index: kaffe/libraries/clib/nio/gnu_java_nio_charset_iconv_IconvDecoder.c
diff -u kaffe/libraries/clib/nio/gnu_java_nio_charset_iconv_IconvDecoder.c:1.3 kaffe/libraries/clib/nio/gnu_java_nio_charset_iconv_IconvDecoder.c:1.4
--- kaffe/libraries/clib/nio/gnu_java_nio_charset_iconv_IconvDecoder.c:1.3	Sat May 14 23:46:09 2005
+++ kaffe/libraries/clib/nio/gnu_java_nio_charset_iconv_IconvDecoder.c	Tue May 31 21:18:30 2005
@@ -123,8 +123,8 @@
   size_t lenIn = (size_t) remIn;
   size_t lenOut = (size_t) remOut * 2;
 
-  inputcopy = input = (*env)->GetByteArrayElements (env, inArr, 0);
-  outputcopy = output = (*env)->GetCharArrayElements (env, outArr, 0);
+  inputcopy = input = (*env)->GetByteArrayElements (env, inArr, NULL);
+  outputcopy = output = (*env)->GetCharArrayElements (env, outArr, NULL);
 
   input += posIn;
   output += posOut;
Index: kaffe/libraries/clib/nio/gnu_java_nio_charset_iconv_IconvEncoder.c
diff -u kaffe/libraries/clib/nio/gnu_java_nio_charset_iconv_IconvEncoder.c:1.3 kaffe/libraries/clib/nio/gnu_java_nio_charset_iconv_IconvEncoder.c:1.4
--- kaffe/libraries/clib/nio/gnu_java_nio_charset_iconv_IconvEncoder.c:1.3	Sat May 14 23:46:09 2005
+++ kaffe/libraries/clib/nio/gnu_java_nio_charset_iconv_IconvEncoder.c	Tue May 31 21:18:30 2005
@@ -123,8 +123,8 @@
   size_t lenIn = (size_t) remIn * 2;
   size_t lenOut = (size_t) remOut;
 
-  inputcopy = input = (*env)->GetCharArrayElements (env, inArr, 0);
-  outputcopy = output = (*env)->GetByteArrayElements (env, outArr, 0);
+  inputcopy = input = (*env)->GetCharArrayElements (env, inArr, NULL);
+  outputcopy = output = (*env)->GetByteArrayElements (env, outArr, NULL);
 
   input += posIn;
   output += posOut;
Index: kaffe/libraries/clib/nio/java_nio_VMDirectByteBuffer.c
diff -u kaffe/libraries/clib/nio/java_nio_VMDirectByteBuffer.c:1.7 kaffe/libraries/clib/nio/java_nio_VMDirectByteBuffer.c:1.8
--- kaffe/libraries/clib/nio/java_nio_VMDirectByteBuffer.c:1.7	Tue May 31 17:55:53 2005
+++ kaffe/libraries/clib/nio/java_nio_VMDirectByteBuffer.c	Tue May 31 21:18:30 2005
@@ -157,7 +157,7 @@
     {
       JCL_ThrowException (env, "java/lang/OutOfMemoryError",
 			  "unable to allocate memory for direct byte buffer");
-      return 0;
+      return NULL;
     }
   
   return NIOGetRawData (env, buffer);




More information about the kaffe mailing list