[kaffe] CVS kaffe (dalibor): Fixed iconv() related warnings

Kaffe CVS cvs-commits at kaffe.org
Wed Mar 24 11:47:10 PST 2004


PatchSet 4569 
Date: 2004/03/24 19:26:29
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fixed iconv() related warnings

2004-03-24  Dalibor Topic <robilad at kaffe.org>

        * libraries/clib/native/ByteToCharIconv.c,
        libraries/clib/native/CharToByteIconv.c:
        Use ICONV_CONST to fix compiler warnings.

Members: 
	ChangeLog:1.2147->1.2148 
	libraries/clib/native/ByteToCharIconv.c:1.8->1.9 
	libraries/clib/native/CharToByteIconv.c:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2147 kaffe/ChangeLog:1.2148
--- kaffe/ChangeLog:1.2147	Wed Mar 24 18:41:42 2004
+++ kaffe/ChangeLog	Wed Mar 24 19:26:29 2004
@@ -1,5 +1,11 @@
 2004-03-24  Dalibor Topic <robilad at kaffe.org>
 
+        * libraries/clib/native/ByteToCharIconv.c,
+        libraries/clib/native/CharToByteIconv.c:
+	Use ICONV_CONST to fix compiler warnings.
+
+2004-03-24  Dalibor Topic <robilad at kaffe.org>
+
 	* configure.ac:
 	Disabled -Wtraditional warnings again since
 	they added too much noise.
Index: kaffe/libraries/clib/native/ByteToCharIconv.c
diff -u kaffe/libraries/clib/native/ByteToCharIconv.c:1.8 kaffe/libraries/clib/native/ByteToCharIconv.c:1.9
--- kaffe/libraries/clib/native/ByteToCharIconv.c:1.8	Fri Mar 12 10:38:44 2004
+++ kaffe/libraries/clib/native/ByteToCharIconv.c	Wed Mar 24 19:26:32 2004
@@ -83,7 +83,7 @@
     iconv_t	cd = (iconv_t) (*env)->GetObjectField(env, _this, cd_id);
     int		ret;
 
-    ret = iconv (cd, &icv_in, &icv_inlen, &icv_out, &icv_outlen);
+    ret = iconv (cd, (ICONV_CONST char **) &icv_in, &icv_inlen, &icv_out, &icv_outlen);
     if (ret < 0) {
 	/* convert the begining of an invalid  multibyte  sequence to '?' */
 	if (errno == EILSEQ) {
Index: kaffe/libraries/clib/native/CharToByteIconv.c
diff -u kaffe/libraries/clib/native/CharToByteIconv.c:1.6 kaffe/libraries/clib/native/CharToByteIconv.c:1.7
--- kaffe/libraries/clib/native/CharToByteIconv.c:1.6	Fri Mar 12 10:38:44 2004
+++ kaffe/libraries/clib/native/CharToByteIconv.c	Wed Mar 24 19:26:32 2004
@@ -81,7 +81,7 @@
     iconv_t	cd = (iconv_t) (*env)->GetObjectField(env, _this, cd_id);
     int		ret;
 
-    ret = iconv (cd, &icv_in, &icv_inlen, &icv_out, &icv_outlen);
+    ret = iconv (cd, (ICONV_CONST char **) &icv_in, &icv_inlen, &icv_out, &icv_outlen);
     if (icv_inlen > 0) {
 	/* In case we have some bytes left, save them */
 	(*env)->CallVoidMethod(env, _this, carry_id,




More information about the kaffe mailing list