cvs: ZendEngine2 / zend.c

helly Wed Mar 1 16:18:35 2006 UTC Modified files: /ZendEngine2 zend.c Log: - Must use return as in 5.1 after recursion http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend.c?r1=1.339&r2=1.340&diff_format=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.339 ZendEngine2/zend.c:1.340 --- ZendEngine2/zend.c:1.339 Wed Mar 1 16:15:40 2006 +++ ZendEngine2/zend.c Wed Mar 1 16:18:35 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.339 2006/03/01 16:15:40 helly Exp $ */ +/* $Id: zend.c,v 1.340 2006/03/01 16:18:35 helly Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -365,9 +365,8 @@ } else { ZVAL_ZVAL(expr_copy, z, 0, 1); *use_copy = 1; - return; } - break; + return; } } zend_error(EG(exception) ? E_ERROR : E_RECOVERABLE_ERROR, "Object of class %v could not be converted to string", Z_OBJCE_P(expr)->name); @@ -432,9 +431,8 @@ } else { ZVAL_ZVAL(expr_copy, z, 0, 1); *use_copy = 1; - return; } - break; + return; } } zend_error(EG(exception) ? E_ERROR : E_RECOVERABLE_ERROR, "Object of class %v could not be converted to string", Z_OBJCE_P(expr)->name); @@ -482,9 +480,8 @@ } else { ZVAL_ZVAL(expr_copy, z, 0, 1); *use_copy = 1; - return; } - break; + return; } } zend_error(EG(exception) ? E_ERROR : E_RECOVERABLE_ERROR, "Object of class %v could not be converted to string", Z_OBJCE_P(expr)->name);