[kaffe] CVS kaffe (robilad): small warning fix for adler32

Kaffe CVS cvs-commits at kaffe.org
Wed Apr 5 13:40:32 PDT 2006


PatchSet 7212 
Date: 2006/04/05 20:26:11
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
small warning fix for adler32

2006-04-05  Dalibor Topic  <robilad at kaffe.org>

        * libraries/clib/zip/Adler32.c (java_util_zip_Adler32_update1)
        (java_util_zip_Adler32_update): Added explicit casts to fix
        compiler warnings.

Members: 
	ChangeLog:1.4719->1.4720 
	libraries/clib/zip/Adler32.c:1.9->1.10 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4719 kaffe/ChangeLog:1.4720
--- kaffe/ChangeLog:1.4719	Tue Apr  4 00:05:11 2006
+++ kaffe/ChangeLog	Wed Apr  5 20:26:11 2006
@@ -1,3 +1,9 @@
+2006-04-05  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/clib/zip/Adler32.c (java_util_zip_Adler32_update1) 
+	(java_util_zip_Adler32_update): Added explicit casts to fix
+	compiler warnings.
+
 2006-04-03  Dalibor Topic  <robilad at kaffe.org>
 
 	* kaffe/kaffevm/boehm-gc/boehm/cord/de.c,
Index: kaffe/libraries/clib/zip/Adler32.c
diff -u kaffe/libraries/clib/zip/Adler32.c:1.9 kaffe/libraries/clib/zip/Adler32.c:1.10
--- kaffe/libraries/clib/zip/Adler32.c:1.9	Sun Feb  5 00:36:41 2006
+++ kaffe/libraries/clib/zip/Adler32.c	Wed Apr  5 20:26:15 2006
@@ -22,7 +22,9 @@
 {
 	// XXX What happens if out of bounds ? 
 	if (from >= 0 && len > 0 && from + len <= obj_length(buf)) {
-		unhand(this)->adler = adler32((uint32)unhand(this)->adler, &unhand_array(buf)->body[from], (unsigned)len);
+		unhand(this)->adler = adler32((uLong)unhand(this)->adler, 
+					      (const Bytef *)&unhand_array(buf)->body[from], 
+					      (uInt)len);
 	}
 }
 
@@ -32,6 +34,8 @@
 	jbyte b;
 
 	b = val;
-	unhand(this)->adler = adler32((uint32)unhand(this)->adler, &b, sizeof(b));
+	unhand(this)->adler = adler32((uLong)unhand(this)->adler, 
+				      (const Bytef *)&b, 
+				      (uInt)sizeof(b));
 }
 




More information about the kaffe mailing list