cvs: ZendEngine2(PHP_5_2) / zend_exceptions.c zend_interfaces.c

tony2001 Thu May 18 21:24:04 2006 UTC Modified files: (Branch: PHP_5_2) /ZendEngine2 zend_exceptions.c zend_interfaces.c Log: there is no %v in 5.2 http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_exceptions.c?r1=1.79.2.6.2.1&r2=1.79.2.6.2.2&diff_format=u Index: ZendEngine2/zend_exceptions.c diff -u ZendEngine2/zend_exceptions.c:1.79.2.6.2.1 ZendEngine2/zend_exceptions.c:1.79.2.6.2.2 --- ZendEngine2/zend_exceptions.c:1.79.2.6.2.1 Tue May 9 23:53:23 2006 +++ ZendEngine2/zend_exceptions.c Thu May 18 21:24:04 2006 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_exceptions.c,v 1.79.2.6.2.1 2006/05/09 23:53:23 helly Exp $ */ +/* $Id: zend_exceptions.c,v 1.79.2.6.2.2 2006/05/18 21:24:04 tony2001 Exp $ */ #include "zend.h" #include "zend_API.h" @@ -686,7 +686,7 @@ file = NULL; line = NULL; } - zend_error_va(E_WARNING, file ? Z_STRVAL_P(file) : NULL, line ? Z_LVAL_P(line) : 0, "Uncaught %v in exception handling during call to %v::__tostring()", Z_OBJCE_P(EG(exception))->name, ce_exception->name); + zend_error_va(E_WARNING, file ? Z_STRVAL_P(file) : NULL, line ? Z_LVAL_P(line) : 0, "Uncaught %s in exception handling during call to %s::__tostring()", Z_OBJCE_P(EG(exception))->name, ce_exception->name); } str = zend_read_property(default_exception_ce, exception, "string", sizeof("string")-1, 1 TSRMLS_CC); http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_interfaces.c?r1=1.33.2.4.2.2&r2=1.33.2.4.2.3&diff_format=u Index: ZendEngine2/zend_interfaces.c diff -u ZendEngine2/zend_interfaces.c:1.33.2.4.2.2 ZendEngine2/zend_interfaces.c:1.33.2.4.2.3 --- ZendEngine2/zend_interfaces.c:1.33.2.4.2.2 Thu May 11 21:07:39 2006 +++ ZendEngine2/zend_interfaces.c Thu May 18 21:24:04 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_interfaces.c,v 1.33.2.4.2.2 2006/05/11 21:07:39 helly Exp $ */ +/* $Id: zend_interfaces.c,v 1.33.2.4.2.3 2006/05/18 21:24:04 tony2001 Exp $ */ #include "zend.h" #include "zend_API.h" @@ -432,7 +432,7 @@ } if (result == FAILURE) { - zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "%v::serialize() must return a string or NULL", ce->name); + zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "%s::serialize() must return a string or NULL", ce->name); } return result; }