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_heap.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_heap.c')
| -rw-r--r-- | ext/spl/spl_heap.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c index f790576b70..ad520f948a 100644 --- a/ext/spl/spl_heap.c +++ b/ext/spl/spl_heap.c @@ -694,7 +694,8 @@ SPL_METHOD(SplPriorityQueue, extract) return; } - RETVAL_ZVAL(value_out, 1, 0); + ZVAL_DEREF(value_out); + ZVAL_COPY(return_value, value_out); zval_ptr_dtor(&value); } /* }}} */ @@ -731,7 +732,8 @@ SPL_METHOD(SplPriorityQueue, top) return; } - RETURN_ZVAL(value_out, 1, 0); + ZVAL_DEREF(value_out); + ZVAL_COPY(return_value, value_out); } /* }}} */ @@ -844,7 +846,8 @@ SPL_METHOD(SplHeap, top) return; } - RETURN_ZVAL(value, 1, 0); + ZVAL_DEREF(value); + ZVAL_COPY(return_value, value); } /* }}} */ @@ -1032,7 +1035,8 @@ SPL_METHOD(SplHeap, current) if (!intern->heap->count || Z_ISUNDEF_P(element)) { RETURN_NULL(); } else { - RETURN_ZVAL(element, 1, 0); + ZVAL_DEREF(element); + ZVAL_COPY(return_value, element); } } /* }}} */ @@ -1058,7 +1062,8 @@ SPL_METHOD(SplPriorityQueue, current) RETURN_NULL(); } - RETURN_ZVAL(data, 1, 0); + ZVAL_DEREF(data); + ZVAL_COPY(return_value, data); } } /* }}} */ |