helly Mon Feb 4 21:37:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl spl.php spl_directory.h /php-src/ext/spl/examples tree.php Log: - MFH Really last flag change (got confused with code) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl.php?r1=1.49.2.11.2.7.2.2&r2=1.49.2.11.2.7.2.3&diff_format=u Index: php-src/ext/spl/spl.php diff -u php-src/ext/spl/spl.php:1.49.2.11.2.7.2.2 php-src/ext/spl/spl.php:1.49.2.11.2.7.2.3 --- php-src/ext/spl/spl.php:1.49.2.11.2.7.2.2 Mon Feb 4 20:40:47 2008 +++ php-src/ext/spl/spl.php Mon Feb 4 21:37:47 2008 @@ -1030,8 +1030,8 @@ */ class RecursiveDirectoryIterator extends DirectoryIterator implements RecursiveIterator { - const CURRENT_AS_FILEINFO 0x00000000; /* make RecursiveDirectoryTree::current() return SplFileInfo */ - const CURRENT_AS_SELF 0x00000010; /* make RecursiveDirectoryTree::current() return getSelf() */ + const CURRENT_AS_SELF 0x00000000; /* make RecursiveDirectoryTree::current() return getSelf() */ + const CURRENT_AS_FILEINFO 0x00000010; /* make RecursiveDirectoryTree::current() return SplFileInfo */ const CURRENT_AS_PATHNAME 0x00000020; /* make RecursiveDirectoryTree::current() return getPathname() */ const KEY_AS_PATHNAME 0x00000000; /* make RecursiveDirectoryTree::key() return getPathname() */ http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.h?r1=1.12.2.5.2.4.2.6&r2=1.12.2.5.2.4.2.7&diff_format=u Index: php-src/ext/spl/spl_directory.h diff -u php-src/ext/spl/spl_directory.h:1.12.2.5.2.4.2.6 php-src/ext/spl/spl_directory.h:1.12.2.5.2.4.2.7 --- php-src/ext/spl/spl_directory.h:1.12.2.5.2.4.2.6 Mon Feb 4 19:33:10 2008 +++ php-src/ext/spl/spl_directory.h Mon Feb 4 21:37:47 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_directory.h,v 1.12.2.5.2.4.2.6 2008/02/04 19:33:10 helly Exp $ */ +/* $Id: spl_directory.h,v 1.12.2.5.2.4.2.7 2008/02/04 21:37:47 helly Exp $ */ #ifndef SPL_DIRECTORY_H #define SPL_DIRECTORY_H @@ -66,7 +66,7 @@ char *_path; int _path_len; char *file_name; - int file_name_len; + int file_name_len; SPL_FS_OBJ_TYPE type; long flags; zend_class_entry *file_class; @@ -116,8 +116,8 @@ #define SPL_FILE_OBJECT_SKIP_EMPTY 0x00000006 /* skip empty lines */ #define SPL_FILE_OBJECT_READ_CSV 0x00000008 /* read via fgetcsv */ -#define SPL_FILE_DIR_CURRENT_AS_FILEINFO 0x00000000 /* make RecursiveDirectoryTree::current() return SplFileInfo */ -#define SPL_FILE_DIR_CURRENT_AS_SELF 0x00000010 /* make RecursiveDirectoryTree::current() return getSelf() */ +#define SPL_FILE_DIR_CURRENT_AS_SELF 0x00000000 /* make RecursiveDirectoryTree::current() return getSelf() */ +#define SPL_FILE_DIR_CURRENT_AS_FILEINFO 0x00000010 /* make RecursiveDirectoryTree::current() return SplFileInfo */ #define SPL_FILE_DIR_CURRENT_AS_PATHNAME 0x00000020 /* make RecursiveDirectoryTree::current() return getPathname() */ #define SPL_FILE_DIR_CURRENT_MODE_MASK 0x000000F0 /* mask RecursiveDirectoryTree::current() */ #define SPL_FILE_DIR_CURRENT(intern,mode) ((intern->flags&SPL_FILE_DIR_CURRENT_MODE_MASK)==mode) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/examples/tree.php?r1=1.12&r2=1.12.6.1&diff_format=u Index: php-src/ext/spl/examples/tree.php diff -u php-src/ext/spl/examples/tree.php:1.12 php-src/ext/spl/examples/tree.php:1.12.6.1 --- php-src/ext/spl/examples/tree.php:1.12 Tue Feb 8 19:10:05 2005 +++ php-src/ext/spl/examples/tree.php Mon Feb 4 21:37:47 2008 @@ -37,4 +37,4 @@ echo $file . "\n"; } -?> \ No newline at end of file +?>
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php