diff options
| author | Marcus Boerger <helly@php.net> | 2007-03-04 14:01:06 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2007-03-04 14:01:06 +0000 |
| commit | fa29c1a2f55b0655c6db598ec03391dc33d0cd5b (patch) | |
| tree | 09b2ea5521352f3249d3256fe669d3c47513ddd4 | |
| parent | ed359b4529f6d73c78a8dfcc81bf1fc3436d1870 (diff) | |
| download | php-git-fa29c1a2f55b0655c6db598ec03391dc33d0cd5b.tar.gz | |
- Fix copy'n'paste issues
| -rwxr-xr-x | ext/spl/spl_directory.c | 4 | ||||
| -rwxr-xr-x | ext/spl/spl_iterators.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 222cf73600..c59f657981 100755 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -1286,7 +1286,7 @@ static void spl_filesystem_tree_it_move_forward(zend_object_iterator *iter TSRML if (!object->u.dir.dirp || !php_stream_readdir(object->u.dir.dirp, &object->u.dir.entry)) { object->u.dir.entry.d_name[0] = '\0'; } - } while (spl_filesystem_is_dot(intern->u.dir.entry.d_name)); + } while (spl_filesystem_is_dot(object->u.dir.entry.d_name)); if (object->file_name) { efree(object->file_name); object->file_name = NULL; @@ -1312,7 +1312,7 @@ static void spl_filesystem_tree_it_rewind(zend_object_iterator *iter TSRMLS_DC) if (!object->u.dir.dirp || !php_stream_readdir(object->u.dir.dirp, &object->u.dir.entry)) { object->u.dir.entry.d_name[0] = '\0'; } - } while (spl_filesystem_is_dot(intern->u.dir.entry.d_name)); + } while (spl_filesystem_is_dot(object->u.dir.entry.d_name)); if (iterator->current) { zval_ptr_dtor(&iterator->current); iterator->current = NULL; diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index e95ca8b9b2..48dfe19f8c 100755 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -1688,9 +1688,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_rec_regex_it___construct, 0, 0, 2) ZEND_END_ARG_INFO(); static zend_function_entry spl_funcs_RecursiveRegexIterator[] = { - SPL_ME(RecursiveRegexIterator, __construct, arginfo_rec_regex_it___construct, ZEND_ACC_PUBLIC) - SPL_ME(ParentIterator, hasChildren, NULL, ZEND_ACC_PUBLIC) - SPL_ME(RecursiveRegexIterator, getChildren, NULL, ZEND_ACC_PUBLIC) + SPL_ME(RecursiveRegexIterator, __construct, arginfo_rec_regex_it___construct, ZEND_ACC_PUBLIC) + SPL_ME(RecursiveFilterIterator, hasChildren, NULL, ZEND_ACC_PUBLIC) + SPL_ME(RecursiveRegexIterator, getChildren, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; #endif |