diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-10-11 12:49:33 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-10-11 13:04:08 +0200 |
| commit | 900ee5705fb6bbdabe0cc4681ff5b764e9222af8 (patch) | |
| tree | 101af7d2a44d685851249bae7aeb9cf8f98a99ee /ext/mbstring/mbstring.c | |
| parent | 2c7be428530df41bb5de23e7788677930b618903 (diff) | |
| download | php-git-900ee5705fb6bbdabe0cc4681ff5b764e9222af8.tar.gz | |
Remove unnecessary HASH_OF uses in mbstring
Diffstat (limited to 'ext/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index cdecd99385..bfda20aa75 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -3149,7 +3149,7 @@ MBSTRING_API HashTable *php_mb_convert_encoding_recursive(HashTable *input, cons ZVAL_COPY(&entry_tmp, entry); break; case IS_ARRAY: - chash = php_mb_convert_encoding_recursive(HASH_OF(entry), _to_encoding, _from_encodings); + chash = php_mb_convert_encoding_recursive(Z_ARRVAL_P(entry), _to_encoding, _from_encodings); if (chash) { ZVAL_ARR(&entry_tmp, chash); } else { @@ -3248,7 +3248,7 @@ PHP_FUNCTION(mb_convert_encoding) } } else { HashTable *tmp; - tmp = php_mb_convert_encoding_recursive(HASH_OF(input), arg_new, _from_encodings); + tmp = php_mb_convert_encoding_recursive(Z_ARRVAL_P(input), arg_new, _from_encodings); RETURN_ARR(tmp); } @@ -4755,7 +4755,7 @@ MBSTRING_API int php_mb_check_encoding_recursive(HashTable *vars, const zend_str } break; case IS_ARRAY: - if (!php_mb_check_encoding_recursive(HASH_OF(entry), enc)) { + if (!php_mb_check_encoding_recursive(Z_ARRVAL_P(entry), enc)) { valid = 0; break; } @@ -4811,7 +4811,7 @@ PHP_FUNCTION(mb_check_encoding) } break; case IS_ARRAY: - if (!php_mb_check_encoding_recursive(HASH_OF(input), enc)) { + if (!php_mb_check_encoding_recursive(Z_ARRVAL_P(input), enc)) { RETURN_FALSE; } break; |