[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/spl/spl_directory.c trunk/ext/spl/spl_directory.c

[Pierre Joye]

pajoye                                   Fri, 09 Sep 2011 07:56:42 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=316443

Log:
- improve r316420, function must return a value

Changed paths:
    U   php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
    U   php/php-src/trunk/ext/spl/spl_directory.c

Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c        2011-09-09 
07:52:16 UTC (rev 316442)
+++ php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c        2011-09-09 
07:56:42 UTC (rev 316443)
@@ -260,7 +260,7 @@
                intern->u.file.open_mode = NULL;
                intern->file_name = NULL;
                zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, 
"Cannot use SplFileObject with directories");
-               return;
+               return FAILURE;
        }

        intern->u.file.context = 
php_stream_context_from_zval(intern->u.file.zcontext, 0);

Modified: php/php-src/trunk/ext/spl/spl_directory.c
===================================================================
--- php/php-src/trunk/ext/spl/spl_directory.c   2011-09-09 07:52:16 UTC (rev 
316442)
+++ php/php-src/trunk/ext/spl/spl_directory.c   2011-09-09 07:56:42 UTC (rev 
316443)
@@ -260,7 +260,7 @@
                intern->u.file.open_mode = NULL;
                intern->file_name = NULL;
                zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, 
"Cannot use SplFileObject with directories");
-               return;
+               return FAILURE;
        }

        intern->u.file.context = 
php_stream_context_from_zval(intern->u.file.zcontext, 0);


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