diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-07-01 02:05:21 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-07-01 02:05:21 +0300 |
| commit | 53403fe56d7c80eff75a3bd1bfd014aa33ac457b (patch) | |
| tree | 9d52b063b5f53292d25beac0ad5d215774df0262 /ext/spl/spl_fixedarray.c | |
| parent | 324d5ecb7e6d8ded78d23becc89b0d54a8714f29 (diff) | |
| download | php-git-53403fe56d7c80eff75a3bd1bfd014aa33ac457b.tar.gz | |
Get rid of ZVAL_ZVAL() macro usages. Replace them with more clear and optimal equialent sequences.
Diffstat (limited to 'ext/spl/spl_fixedarray.c')
| -rw-r--r-- | ext/spl/spl_fixedarray.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index faac492b2a..255412d89c 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -805,9 +805,11 @@ SPL_METHOD(SplFixedArray, offsetGet) value = spl_fixedarray_object_read_dimension_helper(intern, zindex); if (value) { - RETURN_ZVAL(value, 1, 0); + ZVAL_DEREF(value); + ZVAL_COPY(return_value, value); + } else { + RETURN_NULL(); } - RETURN_NULL(); } /* }}} */ /* {{{ proto void SplFixedArray::offsetSet(mixed $index, mixed $newval) @@ -1001,9 +1003,11 @@ SPL_METHOD(SplFixedArray, current) zval_ptr_dtor(&zindex); if (value) { - RETURN_ZVAL(value, 1, 0); + ZVAL_DEREF(value); + ZVAL_COPY(return_value, value); + } else { + RETURN_NULL(); } - RETURN_NULL(); } /* }}} */ |