cvs: ZendEngine2 / zend_API.c

helly Thu Feb 7 18:40:45 2008 UTC Modified files: /ZendEngine2 zend_API.c Log: - Simplify http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.461&r2=1.462&diff_format=u Index: ZendEngine2/zend_API.c diff -u ZendEngine2/zend_API.c:1.461 ZendEngine2/zend_API.c:1.462 --- ZendEngine2/zend_API.c:1.461 Wed Feb 6 22:00:21 2008 +++ ZendEngine2/zend_API.c Thu Feb 7 18:40:44 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.c,v 1.461 2008/02/06 22:00:21 helly Exp $ */ +/* $Id: zend_API.c,v 1.462 2008/02/07 18:40:44 helly Exp $ */ #include "zend.h" #include "zend_execute.h" @@ -2729,9 +2729,7 @@ EG(scope) = last_scope; if (!*ce_ptr) { if (error) { - zstr cname = ezstrndup(Z_TYPE_P(callable), Z_UNIVAL_P(callable), clen); - zend_spprintf(error, 0, "class '%R' not found", Z_TYPE_P(callable), cname.v); - efree(cname.v); + zend_spprintf(error, 0, "class '%.*Z' not found", clen, callable); } return 0; } @@ -2748,7 +2746,7 @@ *ce_ptr = ce_org; } else { /* We already checked for plain function before. */ - if (error) zend_spprintf(error, 0, "function '%R' not found or invalid function name", Z_TYPE_P(callable), Z_UNIVAL_P(callable)); + if (error) zend_spprintf(error, 0, "function '%Z' not found or invalid function name", callable); return 0; }