clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix RecursiveIteratorIterator

Browse Source
This commit is contained in:
Marcus Boerger 2003-11-17 00:57:01 +00:00
parent 3bfa497254
commit 54352a63ad
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/spl/spl_iterators.c
View File

@ -145,7 +145,7 @@ static void spl_recursive_it_get_current_data(zend_object_iterator *iter, zval *
spl_recursive_it_object *object = (spl_recursive_it_object*)iter->data;
zend_object_iterator *sub_iter = object->iterators[object->level].iterator;
return sub_iter->funcs->get_current_data(sub_iter, data TSRMLS_CC);
sub_iter->funcs->get_current_data(sub_iter, data TSRMLS_CC);
}
static int spl_recursive_it_get_current_key(zend_object_iterator *iter, char **str_key, uint *str_key_len, ulong *int_key TSRMLS_DC)
@ -346,7 +346,7 @@ SPL_METHOD(RecursiveIteratorIterator, key)
if (iterator->funcs->get_current_key(iterator, &str_key, &str_key_len, &int_key TSRMLS_CC) == HASH_KEY_IS_LONG) {
RETURN_LONG(int_key);
} else {
RETURN_STRINGL(str_key, str_key_len, 1);
RETURN_STRINGL(str_key, str_key_len-1, 0);
}
} else {
RETURN_NULL();
@ -360,8 +360,7 @@ SPL_METHOD(RecursiveIteratorIterator, current)
zval **data;
iterator->funcs->get_current_data(iterator, &data TSRMLS_CC);
*return_value = **data;
return_value->refcount++;
REPLACE_ZVAL_VALUE(&return_value, *data, 1);
}
SPL_METHOD(RecursiveIteratorIterator, next)