cvs: php4 /ext/iconv iconv.c
| From: | Wez Furlong | Date: | Wed, 10 Apr 2002 23:51:50 +0000 |
| Subject: | cvs: php4 /ext/iconv iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11022@lists.php.net to get a copy of this message | ||
wez Wed Apr 10 19:51:50 2002 EDT
Modified files:
/php4/ext/iconv iconv.c
Log:
fix warning
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.35 php4/ext/iconv/iconv.c:1.36
--- php4/ext/iconv/iconv.c:1.35 Thu Mar 21 15:22:05 2002
+++ php4/ext/iconv/iconv.c Wed Apr 10 19:51:48 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.35 2002/03/21 20:22:05 sniper Exp $ */
+/* $Id: iconv.c,v 1.36 2002/04/10 23:51:48 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -225,7 +225,7 @@
bsz = out_left;
out_buf = (char *) emalloc(bsz+1);
out_p = out_buf;
- result = iconv(cd, (char **) &in_p, &in_left, (char **) &out_p, &out_left);
+ result = iconv(cd, (const char **) &in_p, &in_left, (char **) &out_p, &out_left);
out_size = bsz - out_left;
for (i = 2;in_left > 0 && errno == E2BIG; i++) {
/* converted string is longer than out buffer */
@@ -237,7 +237,7 @@
out_p = tmp_buf;
out_p += out_size;
out_left = in_len;
- result = iconv(cd, (char **)&in_p, &in_left, &out_p, &out_left);
+ result = iconv(cd, (const char **)&in_p, &in_left, &out_p, &out_left);
out_size += bsz - out_left;
}
iconv_close(cd);