helly Thu Nov 11 14:36:28 2004 EDT
Modified files:
/php-src/ext/spl spl_iterators.c
Log:
- Use appropriate exception class where possible
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.58&r2=1.59&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.58
php-src/ext/spl/spl_iterators.c:1.59
--- php-src/ext/spl/spl_iterators.c:1.58 Thu Nov 11 14:31:27 2004
+++ php-src/ext/spl/spl_iterators.c Thu Nov 11 14:36:27 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.58 2004/11/11 19:31:27 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.59 2004/11/11 19:36:27 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -628,7 +628,7 @@
zval *zobject;
spl_dual_it_object *intern;
- php_set_error_handling(EH_THROW, zend_exception_get_default()
TSRMLS_CC);
+ php_set_error_handling(EH_THROW, spl_ce_InvalidArgumentException
TSRMLS_CC);
intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
@@ -693,6 +693,8 @@
break;
}
+ php_set_error_handling(EH_THROW, zend_exception_get_default()
TSRMLS_CC);
+
zobject->refcount++;
intern->inner.zobject = zobject;
intern->inner.ce = Z_OBJCE_P(zobject);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
