helly Sun Mar 4 14:01:06 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/spl spl_directory.c spl_iterators.c
Log:
- Fix copy'n'paste issues
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.18&r2=1.45.2.27.2.19&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.18
php-src/ext/spl/spl_directory.c:1.45.2.27.2.19
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.18 Sun Mar 4 12:18:02 2007
+++ php-src/ext/spl/spl_directory.c Sun Mar 4 14:01:06 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.45.2.27.2.18 2007/03/04 12:18:02 helly Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.27.2.19 2007/03/04 14:01:06 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1286,7 +1286,7 @@
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 @@
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;
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.26&r2=1.73.2.30.2.27&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.26
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.27
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.26 Sun Mar 4 12:18:02 2007
+++ php-src/ext/spl/spl_iterators.c Sun Mar 4 14:01:06 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.73.2.30.2.26 2007/03/04 12:18:02 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.27 2007/03/04 14:01:06 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1688,9 +1688,9 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
