com php-src: Unnecessary UNDEF: Zend/zend.c
| From: | Xinchen Hui | Date: | Thu, 09 Apr 2015 06:16:04 +0000 |
| Subject: | com php-src: Unnecessary UNDEF: Zend/zend.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86144@lists.php.net to get a copy of this message | ||
Commit: 5fd2f975eee53f379bfe0fc15aa5f9294f767a17
Author: Xinchen Hui <laruence@php.net> Thu, 9 Apr 2015 14:16:04 +0800
Parents: 8d3c4e59886a12f2be78d668efb7376a5b9f0b9e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5fd2f975eee53f379bfe0fc15aa5f9294f767a17
Log:
Unnecessary UNDEF
Changed paths:
M Zend/zend.c
Diff:
diff --git a/Zend/zend.c b/Zend/zend.c
index a7d4568..38b5bd6 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1227,7 +1227,6 @@ static void zend_error_va_list(int type, const char *format, va_list args)
CG(in_compilation) = 0;
}
- ZVAL_UNDEF(&retval);
if (call_user_function_ex(CG(function_table), NULL, &orig_user_error_handler, &retval,
5, params, 1, NULL) == SUCCESS) {
if (Z_TYPE(retval) != IS_UNDEF) {
if (Z_TYPE(retval) == IS_FALSE) {
@@ -1390,7 +1389,7 @@ ZEND_API int zend_execute_scripts(int type, zval *retval, int file_count, ...)
/
EG(exception) = NULL;
ZVAL_OBJ(¶ms[0], old_exception);
ZVAL_COPY_VALUE(&orig_user_exception_handler, &EG(user_exception_handler));
- ZVAL_UNDEF(&retval2);
+
if (call_user_function_ex(CG(function_table), NULL, &orig_user_exception_handler,
&retval2, 1, params, 1, NULL) == SUCCESS) {
zval_ptr_dtor(&retval2);
if (EG(exception)) {