cvs: php4 /ext/iconv iconv.c

moriyoshi Fri Nov 8 13:40:55 2002 EDT Modified files: /php4/ext/iconv iconv.c Log: Use proper types Index: php4/ext/iconv/iconv.c diff -u php4/ext/iconv/iconv.c:1.64 php4/ext/iconv/iconv.c:1.65 --- php4/ext/iconv/iconv.c:1.64 Fri Nov 8 13:06:31 2002 +++ php4/ext/iconv/iconv.c Fri Nov 8 13:40:54 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iconv.c,v 1.64 2002/11/08 18:06:31 moriyoshi Exp $ */ +/* $Id: iconv.c,v 1.65 2002/11/08 18:40:54 moriyoshi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -359,15 +359,16 @@ PHP_NAMED_FUNCTION(php_if_iconv) { char *in_charset, *out_charset, *in_buffer, *out_buffer; - unsigned int out_len; - int in_charset_len, out_charset_len, in_buffer_len, err; + size_t out_len; + int in_charset_len, out_charset_len, in_buffer_len; + php_iconv_err_t err; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", &in_charset, &in_charset_len, &out_charset, &out_charset_len, &in_buffer, &in_buffer_len) == FAILURE) return; - err = php_iconv_string(in_buffer, in_buffer_len, - &out_buffer, &out_len, in_charset, out_charset); + err = php_iconv_string(in_buffer, (size_t)in_buffer_len, + &out_buffer, &out_len, in_charset, out_charset); _php_iconv_show_error(err, in_charset, out_charset TSRMLS_CC); if (out_buffer != NULL) { RETVAL_STRINGL(out_buffer, out_len, 0);