]> granicus.if.org Git - php/commitdiff
Caanot use REPLACE_ZVAL_VALUE here.
authorMarcus Boerger <helly@php.net>
Sat, 29 Nov 2003 18:31:24 +0000 (18:31 +0000)
committerMarcus Boerger <helly@php.net>
Sat, 29 Nov 2003 18:31:24 +0000 (18:31 +0000)
ext/spl/spl_directory.c
ext/spl/spl_iterators.c

index 79307488479b5c222d0d9a255d8642b1a9f04df5..668c73af7789be63f4cf07e1afdcf09577fd3457 100755 (executable)
@@ -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);
 }
 /* }}} */
 
index 93e04a6bf4cfd42d2a7a2ea002db3f1081005d5a..258093ff5c4ec8f7b29d1561db8704f9aed8d1d2 100755 (executable)
@@ -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 */