diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-20 10:34:17 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-20 10:34:17 +0100 |
| commit | 68112224221d47169c69ea353beeb73c58ebbe3a (patch) | |
| tree | 6df6967fd6e3641706b14146f741c771e258ca21 /Zend/zend_interfaces.c | |
| parent | 5947437d47cc3bf8f289e52e6361fccad4b08ae3 (diff) | |
| download | php-git-68112224221d47169c69ea353beeb73c58ebbe3a.tar.gz | |
Eliminate uses of ZVAL_ZVAL and friends
Instead add RETURN_COPY(_VALUE) macros will the expected behavior.
RETURN_ZVAL doesn't make any sense since PHP 7, but has stuck
around, probably because the alternative was to write directly to
the return_value variable.
Diffstat (limited to 'Zend/zend_interfaces.c')
| -rw-r--r-- | Zend/zend_interfaces.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c index d2b96e6bf3..b6fdec95be 100644 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c @@ -193,7 +193,7 @@ ZEND_API void zend_user_it_get_current_key(zend_object_iterator *_iter, zval *ke zend_call_method_with_0_params(Z_OBJ_P(object), iter->ce, &iter->ce->iterator_funcs_ptr->zf_key, "key", &retval); if (Z_TYPE(retval) != IS_UNDEF) { - ZVAL_ZVAL(key, &retval, 1, 1); + ZVAL_COPY_VALUE(key, &retval); } else { if (!EG(exception)) { zend_error(E_WARNING, "Nothing returned from %s::key()", ZSTR_VAL(iter->ce->name)); |