Browse Source

Recalssify some E_ERROR into E_CORE_ERROR

pull/1189/merge
Dmitry Stogov 11 years ago
parent
commit
bf259db82e
  1. 2
      Zend/zend_builtin_functions.c
  2. 2
      Zend/zend_execute_API.c
  3. 2
      Zend/zend_vm_execute.h
  4. 2
      Zend/zend_vm_execute.skl

2
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) {

2
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;
}

2
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)

2
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)

Loading…
Cancel
Save