From: Marcus Boerger Date: Sat, 29 Nov 2003 18:31:24 +0000 (+0000) Subject: Caanot use REPLACE_ZVAL_VALUE here. X-Git-Tag: php-5.0.0b3RC1~515 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfa36a8ea7b73f52db3f47b840661d1870d2253c;p=php Caanot use REPLACE_ZVAL_VALUE here. --- diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 7930748847..668c73af77 100755 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -296,7 +296,7 @@ SPL_METHOD(DirectoryIterator, key) Return this (needed for Iterator interface) */ SPL_METHOD(DirectoryIterator, current) { - REPLACE_ZVAL_VALUE(&return_value, getThis(), 1); + RETURN_ZVAL(getThis(), 1, 0); } /* }}} */ diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 93e04a6bf4..258093ff5c 100755 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -368,7 +368,7 @@ SPL_METHOD(RecursiveIteratorIterator, current) zval **data; iterator->funcs->get_current_data(iterator, &data TSRMLS_CC); - REPLACE_ZVAL_VALUE(&return_value, *data, 1); + RETURN_ZVAL(*data, 1, 0); } SPL_METHOD(RecursiveIteratorIterator, next) @@ -398,7 +398,7 @@ SPL_METHOD(RecursiveIteratorIterator, getSubIterator) RETURN_NULL(); } zobject = object->iterators[level].zobject; - REPLACE_ZVAL_VALUE(&return_value, zobject, 1); + RETURN_ZVAL(zobject, 1, 0); } /* {{{ spl_dtor_RecursiveIteratorIterator */