[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_directory.c

[Marcus Boerger]

helly           Mon Feb  4 17:19:07 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/spl    spl_directory.c 
  Log:
  - MFH Fix default flag value in contructor
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.12&r2=1.45.2.27.2.23.2.13&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.12 
php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.13
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.12 Sat Feb  2 23:09:38 2008
+++ php-src/ext/spl/spl_directory.c     Mon Feb  4 17:19:07 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.12 2008/02/02 23:09:38 helly Exp $ 
*/
+/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.13 2008/02/04 17:19:07 helly Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -551,7 +551,7 @@
        spl_filesystem_object *intern;
        char *path;
        int parsed, len;
-       long flags;
+       long flags = 0;
 
        php_set_error_handling(EH_THROW, spl_ce_UnexpectedValueException 
TSRMLS_CC);
 
@@ -1148,7 +1148,7 @@
        ZVAL_LONG(&zflags, intern->flags);
        ZVAL_STRINGL(&zpath, intern->file_name, intern->file_name_len, 0);
 
-       spl_instantiate_arg_ex2(spl_ce_RecursiveDirectoryIterator, 
&return_value, 0, &zpath, &zflags TSRMLS_CC);
+       spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), &return_value, 0, &zpath, 
&zflags TSRMLS_CC);
        
        subdir = 
(spl_filesystem_object*)zend_object_store_get_object(return_value TSRMLS_CC);
        if (subdir) {

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