Re: [PHP-CVS] cvs: php-src /ext/spl spl_directory.c

[Jani Taskinen]

Bunny will be spared..this time. :)

--Jani

Advertising

Marcus Boerger wrote:

Hello Marcus,

   pfffff, I executed the commands in the wrong window/order. Now head got
   MFH :-)

Wednesday, July 23, 2008, 8:12:44 AM, you wrote:

helly           Wed Jul 23 06:12:44 2008 UTC

Modified files: /php-src/ext/spl spl_directory.c Log:

  - MFH [DOC] Add FilesystemIterator::SKIP_DOTS (flag to skip '.' and '..' in 
iteration)

http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.160&r2=1.161&diff_format=u

Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.160
php-src/ext/spl/spl_directory.c:1.161
--- php-src/ext/spl/spl_directory.c:1.160       Sat Jul 19 11:20:04 2008
+++ php-src/ext/spl/spl_directory.c     Wed Jul 23 06:12:44 2008
@@ -16,7 +16,7 @@

+----------------------------------------------------------------------+

  */

-/* $Id: spl_directory.c,v 1.160 2008/07/19 11:20:04 colder Exp $ */

+/* $Id: spl_directory.c,v 1.161 2008/07/23 06:12:44 helly Exp $ */

#ifdef HAVE_CONFIG_H

 # include "config.h"
@@ -1848,7 +1848,7 @@
 static const zend_function_entry spl_FilesystemIterator_functions[] = {

SPL_ME(FilesystemIterator, __construct, arginfo_r_dir___construct, ZEND_ACC_PUBLIC)

        SPL_ME(FilesystemIterator, rewind,        NULL, ZEND_ACC_PUBLIC)
-       SPL_ME(DirectoryIterator, next,           NULL, ZEND_ACC_PUBLIC)
+       SPL_ME(DirectoryIterator,  next,          NULL, ZEND_ACC_PUBLIC)
        SPL_ME(FilesystemIterator, key,           NULL, ZEND_ACC_PUBLIC)
        SPL_ME(FilesystemIterator, current,       NULL, ZEND_ACC_PUBLIC)
        SPL_ME(FilesystemIterator, getFlags,      NULL, ZEND_ACC_PUBLIC)
@@ -2769,6 +2769,7 @@
        REGISTER_SPL_CLASS_CONST_LONG(FilesystemIterator,
"KEY_AS_PATHNAME",     SPL_FILE_DIR_KEY_AS_PATHNAME);
        REGISTER_SPL_CLASS_CONST_LONG(FilesystemIterator,
"KEY_AS_FILENAME",     SPL_FILE_DIR_KEY_AS_FILENAME);
        REGISTER_SPL_CLASS_CONST_LONG(FilesystemIterator,
"NEW_CURRENT_AND_KEY",
SPL_FILE_DIR_KEY_AS_FILENAME|SPL_FILE_DIR_CURRENT_AS_FILEINFO);
+       REGISTER_SPL_CLASS_CONST_LONG(FilesystemIterator, "SKIP_DOTS",   
SPL_FILE_DIR_SKIPDOTS);

spl_ce_FilesystemIterator->get_iterator = spl_filesystem_tree_get_iterator;

Best regards,
 Marcus

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php