diff options
| author | Anatol Belski <ab@php.net> | 2014-10-23 10:24:16 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-23 10:30:04 +0200 |
| commit | 0413a6e7a3b5fec38e5d24f49e7dad8c5f8799b7 (patch) | |
| tree | 218de8a5435cf6e13dfb93d973fd64d230b5fafc | |
| parent | c448023bd0dbf476c5141f558a12e7dcf23d5e80 (diff) | |
| download | php-git-0413a6e7a3b5fec38e5d24f49e7dad8c5f8799b7.tar.gz | |
fix datatype mismatches
| -rw-r--r-- | ext/standard/html.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/html.c b/ext/standard/html.c index dfe30d9b3e..516bcc4ef7 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -377,7 +377,7 @@ static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC) { int i; enum entity_charset charset = cs_utf_8; - int len = 0; + size_t len = 0; const zend_encoding *zenc; /* Default is now UTF-8 */ @@ -1513,7 +1513,7 @@ PHP_FUNCTION(htmlspecialchars_decode) return; } - replaced = php_unescape_html_entities((unsigned char*)str, str_len, 0 /*!all*/, quote_style, NULL TSRMLS_CC); + replaced = php_unescape_html_entities((unsigned char*)str, str_len, 0 /*!all*/, (int)quote_style, NULL TSRMLS_CC); if (replaced) { RETURN_STR(replaced); } @@ -1547,7 +1547,7 @@ PHP_FUNCTION(html_entity_decode) if (!hint_charset) { default_charset = get_default_charset(TSRMLS_C); } - replaced = php_unescape_html_entities((unsigned char*)str->val, str->len, 1 /*all*/, quote_style, (hint_charset ? hint_charset->val : default_charset) TSRMLS_CC); + replaced = php_unescape_html_entities((unsigned char*)str->val, str->len, 1 /*all*/, (int)quote_style, (hint_charset ? hint_charset->val : default_charset) TSRMLS_CC); if (replaced) { RETURN_STR(replaced); @@ -1649,7 +1649,7 @@ PHP_FUNCTION(get_html_translation_table) array_init(return_value); - entity_table = determine_entity_table(all, doctype); + entity_table = determine_entity_table((int)all, doctype); if (all && !CHARSET_UNICODE_COMPAT(charset)) { to_uni_table = enc_to_uni_index[charset]; } |