diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-12 12:33:23 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-12 12:33:23 +0300 |
| commit | 8e10e8f921101e0787c8228d257107a204de3e36 (patch) | |
| tree | 35bad438a9a49a94a7f0b1e061538e03a49e2b78 /ext/spl/spl_observer.c | |
| parent | 730d7b8fcad30addc80d685e046b5f05bb3d0190 (diff) | |
| download | php-git-8e10e8f921101e0787c8228d257107a204de3e36.tar.gz | |
Avoid zval duplication in ZVAL_ZVAL() macro (it was necessary only in few places).
Switch from ZVAL_ZVAL() to simpler macros where possible (it makes sense to review remaining places)
Diffstat (limited to 'ext/spl/spl_observer.c')
| -rw-r--r-- | ext/spl/spl_observer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c index ddff20ea4f..e2a55735a3 100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c @@ -657,7 +657,7 @@ SPL_METHOD(SplObjectStorage, current) if ((element = zend_hash_get_current_data_ptr_ex(&intern->storage, &intern->pos)) == NULL) { return; } - RETVAL_ZVAL(&element->obj, 1, 0); + ZVAL_COPY(return_value, &element->obj); } /* }}} */ /* {{{ proto mixed SplObjectStorage::getInfo() @@ -674,7 +674,7 @@ SPL_METHOD(SplObjectStorage, getInfo) if ((element = zend_hash_get_current_data_ptr_ex(&intern->storage, &intern->pos)) == NULL) { return; } - RETVAL_ZVAL(&element->inf, 1, 0); + ZVAL_COPY(return_value, &element->inf); } /* }}} */ /* {{{ proto mixed SplObjectStorage::setInfo(mixed $inf) @@ -693,7 +693,7 @@ SPL_METHOD(SplObjectStorage, setInfo) return; } zval_ptr_dtor(&element->inf); - ZVAL_ZVAL(&element->inf, inf, 1, 0); + ZVAL_COPY(&element->inf, inf); } /* }}} */ /* {{{ proto void SplObjectStorage::next() |