diff options
| author | Xinchen Hui <laruence@php.net> | 2015-05-06 11:10:33 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-05-06 11:10:33 +0800 |
| commit | 9f0dbdf6c882e476bbad1fe8d42ef7c39362f3fa (patch) | |
| tree | 87841b274396001bb9f790ea148b13d8909c7bb0 /ext/json/json_encoder.c | |
| parent | c7345873032916d5ba4bd6a51a1aaf27d9a1fa5f (diff) | |
| download | php-git-9f0dbdf6c882e476bbad1fe8d42ef7c39362f3fa.tar.gz | |
Use Z_ARRVAL_P since we already know it's an array
Diffstat (limited to 'ext/json/json_encoder.c')
| -rw-r--r-- | ext/json/json_encoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/json/json_encoder.c b/ext/json/json_encoder.c index 11630c9e58..d9bfb16e5b 100644 --- a/ext/json/json_encoder.c +++ b/ext/json/json_encoder.c @@ -46,7 +46,7 @@ static void php_json_escape_string(smart_str *buf, char *s, size_t len, int opti static int php_json_determine_array_type(zval *val) /* {{{ */ { int i; - HashTable *myht = HASH_OF(val); + HashTable *myht = Z_ARRVAL_P(val); i = myht ? zend_hash_num_elements(myht) : 0; if (i > 0) { @@ -121,7 +121,7 @@ static void php_json_encode_array(smart_str *buf, zval *val, int options) /* {{{ HashTable *myht; if (Z_TYPE_P(val) == IS_ARRAY) { - myht = HASH_OF(val); + myht = Z_ARRVAL_P(val); r = (options & PHP_JSON_FORCE_OBJECT) ? PHP_JSON_OUTPUT_OBJECT : php_json_determine_array_type(val); } else { myht = Z_OBJPROP_P(val); @@ -450,7 +450,7 @@ static void php_json_encode_serializable_object(smart_str *buf, zval *val, int o HashTable* myht; if (Z_TYPE_P(val) == IS_ARRAY) { - myht = HASH_OF(val); + myht = Z_ARRVAL_P(val); } else { myht = Z_OBJPROP_P(val); } |