cvs: php4 /ext/iconv iconv.c
| From: | Moriyoshi Koizumi | Date: | Fri, 03 Jan 2003 05:26:45 +0000 |
| Subject: | cvs: php4 /ext/iconv iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-17548@lists.php.net to get a copy of this message | ||
moriyoshi Fri Jan 3 00:26:45 2003 EDT
Modified files:
/php4/ext/iconv iconv.c
Log:
Added missing casting operators
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.69 php4/ext/iconv/iconv.c:1.70
--- php4/ext/iconv/iconv.c:1.69 Fri Jan 3 00:14:34 2003
+++ php4/ext/iconv/iconv.c Fri Jan 3 00:26:44 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.69 2003/01/03 05:14:34 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.70 2003/01/03 05:26:44 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -320,7 +320,7 @@
out_p = (d)->c + (d)->len;
- if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == -1) {
+ if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
#if ICONV_SUPPORTS_ERRNO
switch (errno) {
case EINVAL:
@@ -574,7 +574,7 @@
prev_in_left = in_left;
- if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == -1) {
+ if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
if (prev_in_left == in_left) {
break;
}
@@ -683,7 +683,7 @@
--len;
}
- if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == -1) {
+ if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
if (prev_in_left == in_left) {
break;
}
@@ -785,7 +785,7 @@
prev_in_left = in_left;
- if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == -1) {
+ if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
if (prev_in_left == in_left) {
#if ICONV_SUPPORTS_ERRNO
switch (errno) {
@@ -1000,7 +1000,7 @@
out_p = buf;
out_left = out_size = (char_cnt - 2) / 4 * 3;
- if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == -1) {
+ if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
#if ICONV_SUPPORTS_ERRNO
switch (errno) {
case EINVAL:
@@ -1064,7 +1064,7 @@
out_p = buf;
out_left = out_size = 1;
- if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == -1) {
+ if (icv(cd, &in_p, &in_left, (char **) &out_p, &out_left) == (size_t)-1) {
#if ICONV_SUPPORTS_ERRNO
switch (errno) {
case EINVAL: