diff options
| author | Anatol Belski <ab@php.net> | 2014-08-27 15:31:48 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-27 20:49:31 +0200 |
| commit | 3234480827b27ff5d3469a732167afd289632a96 (patch) | |
| tree | 485ed0c4f5d35107a65ab193f3bc7c27806fbfca /ext/iconv/iconv.c | |
| parent | ee552b628c2d9f9455ac85d7791b4b4e8e4ddeb2 (diff) | |
| download | php-git-3234480827b27ff5d3469a732167afd289632a96.tar.gz | |
first show to make 's' work with size_t
Diffstat (limited to 'ext/iconv/iconv.c')
| -rw-r--r-- | ext/iconv/iconv.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 9a64c99cb9..8af9991f5d 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -2034,7 +2034,7 @@ static void _php_iconv_show_error(php_iconv_err_t err, const char *out_charset, PHP_FUNCTION(iconv_strlen) { char *charset = get_internal_encoding(TSRMLS_C); - int charset_len = 0; + size_t charset_len = 0; zend_string *str; php_iconv_err_t err; @@ -2066,7 +2066,7 @@ PHP_FUNCTION(iconv_strlen) PHP_FUNCTION(iconv_substr) { char *charset = get_internal_encoding(TSRMLS_C); - int charset_len = 0; + size_t charset_len = 0; zend_string *str; zend_long offset, length = 0; @@ -2105,7 +2105,7 @@ PHP_FUNCTION(iconv_substr) PHP_FUNCTION(iconv_strpos) { char *charset = get_internal_encoding(TSRMLS_C); - int charset_len = 0; + size_t charset_len = 0; zend_string *haystk; zend_string *ndl; zend_long offset = 0; @@ -2151,7 +2151,7 @@ PHP_FUNCTION(iconv_strpos) PHP_FUNCTION(iconv_strrpos) { char *charset = get_internal_encoding(TSRMLS_C); - int charset_len = 0; + size_t charset_len = 0; zend_string *haystk; zend_string *ndl; @@ -2304,7 +2304,7 @@ PHP_FUNCTION(iconv_mime_decode) { zend_string *encoded_str; char *charset = get_internal_encoding(TSRMLS_C); - int charset_len = 0; + size_t charset_len = 0; zend_long mode = 0; smart_str retval = {0}; @@ -2344,7 +2344,7 @@ PHP_FUNCTION(iconv_mime_decode_headers) { zend_string *encoded_str; char *charset = get_internal_encoding(TSRMLS_C); - int charset_len = 0; + size_t charset_len = 0; zend_long mode = 0; char *enc_str_tmp; size_t enc_str_len_tmp; @@ -2442,7 +2442,7 @@ PHP_NAMED_FUNCTION(php_if_iconv) { char *in_charset, *out_charset; zend_string *in_buffer; - int in_charset_len = 0, out_charset_len = 0; + size_t in_charset_len = 0, out_charset_len = 0; php_iconv_err_t err; zend_string *out_buffer; @@ -2473,7 +2473,7 @@ PHP_NAMED_FUNCTION(php_if_iconv) PHP_FUNCTION(iconv_set_encoding) { char *type, *charset; - int type_len, charset_len = 0, retval; + size_t type_len, charset_len = 0, retval; zend_string *name; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &type, &type_len, &charset, &charset_len) == FAILURE) |