summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2015-04-02 13:07:17 +0300
committerDmitry Stogov <dmitry@zend.com>2015-04-02 13:07:17 +0300
commitbf259db82e000fcf05135245551348b5dc5cb489 (patch)
tree654fd97cc0a07ff150aeec8c75cd8534aedad3b5
parenta764214b028f8179bc2ffc5d1fb85ed9eb3d24aa (diff)
downloadphp-git-bf259db82e000fcf05135245551348b5dc5cb489.tar.gz
Recalssify some E_ERROR into E_CORE_ERROR
-rw-r--r--Zend/zend_builtin_functions.c2
-rw-r--r--Zend/zend_execute_API.c2
-rw-r--r--Zend/zend_vm_execute.h2
-rw-r--r--Zend/zend_vm_execute.skl2
4 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 0d9e3c002c..ffb78c343e 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 aef46d96ef..b703f18915 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 fde4caed16..145dfb6d0c 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 aba4d2c4f0..6b1720731d 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)