cvs: php-src /ext/spl spl_directory.c spl_directory.h

colder Thu Jun 4 14:46:08 2009 UTC Modified files: /php-src/ext/spl spl_directory.c spl_directory.h Log: Include other flags as well http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.182&r2=1.183&diff_format=u Index: php-src/ext/spl/spl_directory.c diff -u php-src/ext/spl/spl_directory.c:1.182 php-src/ext/spl/spl_directory.c:1.183 --- php-src/ext/spl/spl_directory.c:1.182 Mon May 25 14:32:14 2009 +++ php-src/ext/spl/spl_directory.c Thu Jun 4 14:46:08 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_directory.c,v 1.182 2009/05/25 14:32:14 felipe Exp $ */ +/* $Id: spl_directory.c,v 1.183 2009/06/04 14:46:08 colder Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1334,7 +1334,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) U @@ -1346,8 +1346,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]) U http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.h?r1=1.48&r2=1.49&diff_format=u Index: php-src/ext/spl/spl_directory.h diff -u php-src/ext/spl/spl_directory.h:1.48 php-src/ext/spl/spl_directory.h:1.49 --- php-src/ext/spl/spl_directory.h:1.48 Tue Mar 10 23:39:38 2009 +++ php-src/ext/spl/spl_directory.h Thu Jun 4 14:46:08 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_directory.h,v 1.48 2009/03/10 23:39:38 helly Exp $ */ +/* $Id: spl_directory.h,v 1.49 2009/06/04 14:46:08 colder Exp $ */ #ifndef SPL_DIRECTORY_H #define SPL_DIRECTORY_H @@ -137,6 +137,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 */