iliaa Tue Aug 12 00:19:07 2003 EDT
Modified files:
/php-src/ext/iconv iconv.c
Log:
Fix compiler warnings.
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.94 php-src/ext/iconv/iconv.c:1.95
--- php-src/ext/iconv/iconv.c:1.94 Wed Jul 30 17:56:45 2003
+++ php-src/ext/iconv/iconv.c Tue Aug 12 00:19:06 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.94 2003/07/30 21:56:45 sniper Exp $ */
+/* $Id: iconv.c,v 1.95 2003/08/12 04:19:06 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -243,7 +243,7 @@
out_p = (d)->c + (d)->len;
- if (iconv(cd, &in_p, &in_left, (char **) &out_p, &out_left) ==
(size_t)-1) {
+ if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p,
&out_left) == (size_t)-1) {
#if ICONV_SUPPORTS_ERRNO
switch (errno) {
case EINVAL:
@@ -403,7 +403,7 @@
out_p = out_buf;
while (in_left > 0) {
- result = iconv(cd, (const char **) &in_p, &in_left, (char **) &out_p,
&out_left);
+ result = iconv(cd, (char **) &in_p, &in_left, (char **) &out_p,
&out_left);
out_size = bsz - out_left;
if (result == (size_t)(-1)) {
if (errno == E2BIG && in_left > 0) {
@@ -517,7 +517,7 @@
prev_in_left = in_left;
- if (iconv(cd, &in_p, &in_left, (char **) &out_p, &out_left) ==
(size_t)-1) {
+ if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left)
== (size_t)-1) {
if (prev_in_left == in_left) {
break;
}
@@ -617,7 +617,7 @@
prev_in_left = in_left;
- if (iconv(cd1, &in_p, &in_left, (char **) &out_p, &out_left) ==
(size_t)-1) {
+ if (iconv(cd1, (char **)&in_p, &in_left, (char **) &out_p, &out_left)
== (size_t)-1) {
if (prev_in_left == in_left) {
break;
}
@@ -748,7 +748,7 @@
prev_in_left = in_left;
- if (iconv(cd, &in_p, &in_left, (char **) &out_p, &out_left) ==
(size_t)-1) {
+ if (iconv(cd, (char **)&in_p, &in_left, (char **) &out_p, &out_left)
== (size_t)-1) {
if (prev_in_left == in_left) {
#if ICONV_SUPPORTS_ERRNO
switch (errno) {
@@ -982,7 +982,7 @@
out_left = out_size - out_reserved;
- if (iconv(cd, &in_p, &in_left, (char **)
&out_p, &out_left) == (size_t)-1) {
+ if (iconv(cd, (char **)&in_p, &in_left, (char
**) &out_p, &out_left) == (size_t)-1) {
#if ICONV_SUPPORTS_ERRNO
switch (errno) {
case EINVAL:
@@ -1070,7 +1070,7 @@
out_p = buf;
out_left = out_size = 1;
- if (iconv(cd, &in_p, &in_left, (char **)
&out_p, &out_left) == (size_t)-1) {
+ if (iconv(cd, (char **)&in_p, &in_left, (char
**) &out_p, &out_left) == (size_t)-1) {
#if ICONV_SUPPORTS_ERRNO
switch (errno) {
case EINVAL:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
