colder Thu Jun 4 14:46:26 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/spl spl_directory.c spl_directory.h
Log:
MFH: Include other flags as well
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.42&r2=1.45.2.27.2.23.2.43&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.23.2.42
php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.43
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.42 Sat May 9 21:06:58 2009
+++ php-src/ext/spl/spl_directory.c Thu Jun 4 14:46:26 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.42 2009/05/09 21:06:58 colder Exp $
*/
+/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.43 2009/06/04 14:46:26 colder Exp $
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1216,7 +1216,7 @@
{
spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
- RETURN_LONG(intern->flags & (SPL_FILE_DIR_KEY_MODE_MASK |
SPL_FILE_DIR_CURRENT_MODE_MASK));
+ RETURN_LONG(intern->flags & (SPL_FILE_DIR_KEY_MODE_MASK |
SPL_FILE_DIR_CURRENT_MODE_MASK | SPL_FILE_DIR_OTHERS_MASK));
} /* }}} */
/* {{{ proto void FilesystemIterator::setFlags(long $flags)
@@ -1228,8 +1228,8 @@
zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &flags);
- intern->flags &=
~(SPL_FILE_DIR_KEY_MODE_MASK|SPL_FILE_DIR_CURRENT_MODE_MASK);
- intern->flags |=
((SPL_FILE_DIR_KEY_MODE_MASK|SPL_FILE_DIR_CURRENT_MODE_MASK) & flags);
+ intern->flags &=
~(SPL_FILE_DIR_KEY_MODE_MASK|SPL_FILE_DIR_CURRENT_MODE_MASK|SPL_FILE_DIR_OTHERS_MASK);
+ intern->flags |=
((SPL_FILE_DIR_KEY_MODE_MASK|SPL_FILE_DIR_CURRENT_MODE_MASK|SPL_FILE_DIR_OTHERS_MASK)
& flags);
} /* }}} */
/* {{{ proto bool RecursiveDirectoryIterator::hasChildren([bool $allow_links =
false])
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.h?r1=1.12.2.5.2.4.2.13&r2=1.12.2.5.2.4.2.14&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.13
php-src/ext/spl/spl_directory.h:1.12.2.5.2.4.2.14
--- php-src/ext/spl/spl_directory.h:1.12.2.5.2.4.2.13 Wed Dec 31 11:15:43 2008
+++ php-src/ext/spl/spl_directory.h Thu Jun 4 14:46:26 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.h,v 1.12.2.5.2.4.2.13 2008/12/31 11:15:43 sebastian Exp
$ */
+/* $Id: spl_directory.h,v 1.12.2.5.2.4.2.14 2009/06/04 14:46:26 colder Exp $ */
#ifndef SPL_DIRECTORY_H
#define SPL_DIRECTORY_H
@@ -134,6 +134,7 @@
#define SPL_FILE_DIR_SKIPDOTS 0x00001000 /* Tells whether it
should skip dots or not */
#define SPL_FILE_DIR_UNIXPATHS 0x00002000 /* Whether to unixify
path separators */
+#define SPL_FILE_DIR_OTHERS_MASK 0x00003000 /* mask used for
get/setFlags */
#endif /* SPL_DIRECTORY_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
