com php-src: Recalssify some E_ERROR into E_CORE_ERRO R: Zend/zend_builtin_functions.c Zend/zend_execut e_API.c Zend/zend_vm_execute.h Zend/zend_vm_e
xecute.skl
| From: | Dmitry Stogov | Date: | Thu, 02 Apr 2015 10:07:17 +0000 |
| Subject: | com php-src: Recalssify some E_ERROR into E_CORE_ERRO R: Zend/zend_builtin_functions.c Zend/zend_execut e_API.c Zend/zend_vm_execute.h Zend/zend_vm_e xecute.skl |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86050@lists.php.net to get a copy of this message | ||
Commit: bf259db82e000fcf05135245551348b5dc5cb489
Author: Dmitry Stogov <dmitry@zend.com> Thu, 2 Apr 2015 13:07:17 +0300
Parents: a764214b028f8179bc2ffc5d1fb85ed9eb3d24aa
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bf259db82e000fcf05135245551348b5dc5cb489
Log:
Recalssify some E_ERROR into E_CORE_ERROR
Changed paths:
M Zend/zend_builtin_functions.c
M Zend/zend_execute_API.c
M Zend/zend_vm_execute.h
M Zend/zend_vm_execute.skl
Diff:
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 0d9e3c0..ffb78c3 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1953,7 +1953,7 @@ ZEND_FUNCTION(create_function)
func = zend_hash_str_find_ptr(EG(function_table), LAMBDA_TEMP_FUNCNAME,
sizeof(LAMBDA_TEMP_FUNCNAME)-1);
if (!func) {
- zend_error_noreturn(E_ERROR, "Unexpected inconsistency in create_function()");
+ zend_error_noreturn(E_CORE_ERROR, "Unexpected inconsistency in create_function()");
RETURN_FALSE;
}
if (func->refcount) {
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index aef46d9..b703f18 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -686,7 +686,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) /
case sizeof(zend_fcall_info):
break; /* nothing to do currently */
default:
- zend_error_noreturn(E_ERROR, "Corrupted fcall_info provided to zend_call_function()");
+ zend_error_noreturn(E_CORE_ERROR, "Corrupted fcall_info provided to
zend_call_function()");
break;
}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index fde4cae..145dfb6 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -411,7 +411,7 @@ ZEND_API void execute_ex(zend_execute_data *ex)
}
}
- zend_error_noreturn(E_ERROR, "Arrived at end of main loop which shouldn't happen");
+ zend_error_noreturn(E_CORE_ERROR, "Arrived at end of main loop which shouldn't
happen");
}
ZEND_API void zend_execute(zend_op_array *op_array, zval *return_value)
diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl
index aba4d2c..6b17207 100644
--- a/Zend/zend_vm_execute.skl
+++ b/Zend/zend_vm_execute.skl
@@ -17,7 +17,7 @@ ZEND_API void {%EXECUTOR_NAME%}_ex(zend_execute_data *ex)
}
}
- zend_error_noreturn(E_ERROR, "Arrived at end of main loop which shouldn't happen");
+ zend_error_noreturn(E_CORE_ERROR, "Arrived at end of main loop which shouldn't
happen");
}
ZEND_API void zend_{%EXECUTOR_NAME%}(zend_op_array *op_array, zval *return_value)