diff options
| author | Marcus Boerger <helly@php.net> | 2008-02-04 21:37:55 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2008-02-04 21:37:55 +0000 |
| commit | 9a90cfc99c382a80dd00d0f7b2c49a277d23112d (patch) | |
| tree | ccc8c049211a94dfb00a1d841073e38f013c45be /ext/spl | |
| parent | 2c92d82a0278c82d234a84b977a5e635253f0ef1 (diff) | |
| download | php-git-9a90cfc99c382a80dd00d0f7b2c49a277d23112d.tar.gz | |
- MFH Really last flag change (got confused with code)
Diffstat (limited to 'ext/spl')
| -rwxr-xr-x | ext/spl/examples/tree.php | 2 | ||||
| -rwxr-xr-x | ext/spl/spl.php | 4 | ||||
| -rwxr-xr-x | ext/spl/spl_directory.h | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ext/spl/examples/tree.php b/ext/spl/examples/tree.php index 5af36a673c..9c2cc55866 100755 --- a/ext/spl/examples/tree.php +++ b/ext/spl/examples/tree.php @@ -37,4 +37,4 @@ foreach(new DirectoryGraphIterator($argv[1]) as $file) echo $file . "\n"; } -?>
\ No newline at end of file +?> diff --git a/ext/spl/spl.php b/ext/spl/spl.php index 43c29e9877..2be8057fb9 100755 --- a/ext/spl/spl.php +++ b/ext/spl/spl.php @@ -1019,8 +1019,8 @@ class DirectoryIterator extends SplFileInfo implements Iterator */ 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() */ diff --git a/ext/spl/spl_directory.h b/ext/spl/spl_directory.h index 07ac4062fe..3bc132b7d6 100755 --- a/ext/spl/spl_directory.h +++ b/ext/spl/spl_directory.h @@ -55,7 +55,7 @@ struct _spl_filesystem_object { 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; @@ -93,14 +93,14 @@ struct _spl_filesystem_object { #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) -#define SPL_FILE_DIR_KEY_AS_PATHNAME 0x00000000 /* make RecursiveDirectoryTree::key() return getPathname() */ -#define SPL_FILE_DIR_KEY_AS_FILENAME 0x00000100 /* make RecursiveDirectoryTree::key() return getFilename() */ +#define SPL_FILE_DIR_KEY_AS_FILENAME 0x00000000 /* make RecursiveDirectoryTree::key() return getFilename() */ +#define SPL_FILE_DIR_KEY_AS_PATHNAME 0x00000100 /* make RecursiveDirectoryTree::key() return getPathname() */ #define SPL_FILE_DIR_KEY_MODE_MASK 0x00000F00 /* mask RecursiveDirectoryTree::key() */ #define SPL_FILE_DIR_KEY(intern,mode) ((intern->flags&SPL_FILE_DIR_KEY_MODE_MASK)==mode) |