com php-src: Remove unnecessary HASH_OF uses in mbstrin g: ext/mbstring/mbstring.c
| From: | Nikita Popov | Date: | Thu, 11 Oct 2018 11:04:08 +0000 |
| Subject: | com php-src: Remove unnecessary HASH_OF uses in mbstrin g: ext/mbstring/mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-103435@lists.php.net to get a copy of this message | ||
Commit: 900ee5705fb6bbdabe0cc4681ff5b764e9222af8
Author: Nikita Popov <nikita.ppv@gmail.com> Thu, 11 Oct 2018 12:49:33 +0200
Parents: 2c7be428530df41bb5de23e7788677930b618903
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=900ee5705fb6bbdabe0cc4681ff5b764e9222af8
Log:
Remove unnecessary HASH_OF uses in mbstring
Changed paths:
M ext/mbstring/mbstring.c
Diff:
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index cdecd99..bfda20a 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;