summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2003-11-29 18:31:24 +0000
committerMarcus Boerger <helly@php.net>2003-11-29 18:31:24 +0000
commitbfa36a8ea7b73f52db3f47b840661d1870d2253c (patch)
treef58d446ba1ceba89bbb409d8bf87dad5de4bcf18
parent6344f662a577e415e6b5e1e3e5c201f23219b490 (diff)
downloadphp-git-bfa36a8ea7b73f52db3f47b840661d1870d2253c.tar.gz
Caanot use REPLACE_ZVAL_VALUE here.
-rwxr-xr-xext/spl/spl_directory.c2
-rwxr-xr-xext/spl/spl_iterators.c4
2 files changed, 3 insertions, 3 deletions
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 */