[kaffe] CVS kaffe (robilad): kaffe/kaffevm/kaffe-gc/gc-incremental.c (finishGC)

[Kaffe CVS]

PatchSet 7562 
Date: 2007/09/23 21:16:56
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
2007-09-23  Dalibor Topic  <robilad at kaffe.org>

        * kaffe/kaffevm/kaffe-gc/gc-incremental.c (finishGC)
        (KaffeGC_WalkMemory): Use NULL instead of 0 where appropriate.

Members: 
	ChangeLog:1.5060->1.5061 
	include/jsyscall.h:1.29->1.30 
	kaffe/kaffevm/kaffe-gc/gc-incremental.c:1.39->1.40 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5060 kaffe/ChangeLog:1.5061
--- kaffe/ChangeLog:1.5060	Sun Sep 23 18:58:23 2007
+++ kaffe/ChangeLog	Sun Sep 23 21:16:56 2007
@@ -1,5 +1,10 @@
 2007-09-23  Dalibor Topic  <robilad at kaffe.org>
 
+	* kaffe/kaffevm/kaffe-gc/gc-incremental.c (finishGC)
+	(KaffeGC_WalkMemory): Use NULL instead of 0 where appropriate.
+
+2007-09-23  Dalibor Topic  <robilad at kaffe.org>
+
 	* kaffe/kaffevm/kaffe-gc/gc-refs.c (KaffeGC_addRef, KaffeGC_rmRef,
 	KaffeGC_addWeakRef, KaffeGC_rmWeakRef, KaffeGC_clearWeakRef): 
 	Added debugging statements.
Index: kaffe/include/jsyscall.h
diff -u kaffe/include/jsyscall.h:1.29 kaffe/include/jsyscall.h:1.30
--- kaffe/include/jsyscall.h:1.29	Sun Sep 24 18:24:16 2006
+++ kaffe/include/jsyscall.h	Sun Sep 23 21:16:58 2007
@@ -70,13 +70,13 @@
 	int	(*_remove)(const char *);
 
 	int	(*_socket)(int, int, int, int *);
-	int	(*_connect)(int, struct sockaddr *, socklen_t, int timeout);
+	int	(*_connect)(int, struct sockaddr *, socklen_t, int);
 	int	(*_bind)(int, struct sockaddr *, socklen_t);
 	int	(*_listen)(int, int);
 	int	(*_accept)(int, struct sockaddr *, socklen_t*, int, int *);
 	int	(*_sockread)(int, void*, size_t, int, ssize_t *);
 	int	(*_recvfrom)(int, void *, size_t, int, struct sockaddr *, socklen_t *,
-		int timeout, ssize_t *);
+		int, ssize_t *);
 	int	(*_sockwrite)(int, const void *, size_t, ssize_t *);
 	int	(*_sendto)(int, const void *, size_t, int, const struct sockaddr *,
 		socklen_t, ssize_t *);
Index: kaffe/kaffe/kaffevm/kaffe-gc/gc-incremental.c
diff -u kaffe/kaffe/kaffevm/kaffe-gc/gc-incremental.c:1.39 kaffe/kaffe/kaffevm/kaffe-gc/gc-incremental.c:1.40
--- kaffe/kaffe/kaffevm/kaffe-gc/gc-incremental.c:1.39	Tue Sep 18 15:51:18 2007
+++ kaffe/kaffe/kaffevm/kaffe-gc/gc-incremental.c	Sun Sep 23 21:16:58 2007
@@ -475,7 +475,7 @@
 	size = GCBLOCKSIZE(info);
 	record_marked(1, size);
 	walkf = gcFunctions[KGC_GET_FUNCS(info, idx)].walk;
-	if (walkf != 0) {
+	if (walkf != NULL) {
 DBG(GCWALK,	
 		dprintf("walking %d bytes @%p: %s\n", size, mem, 
 			describeObject(mem));
@@ -824,7 +824,7 @@
 		info = gc_mem2block(unit);
 		idx = GCMEM2IDX(info, unit);
 		destroy = gcFunctions[KGC_GET_FUNCS(info,idx)].destroy;
-		if (destroy != 0) {
+		if (destroy != NULL) {
 			destroy(gcif, UTOMEM(unit));
 		}