diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-30 13:08:35 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-30 13:13:47 +0100 |
| commit | e93bbf4d5d2812c698a4711fc0ff751b170bdf2b (patch) | |
| tree | ffb32b88b3911e8d77910539f2cf83e749a623fc /Zend/zend_API.h | |
| parent | c88e2cce815a6d2d3fa0e7e8f46fe0fc8de6abe3 (diff) | |
| download | php-git-e93bbf4d5d2812c698a4711fc0ff751b170bdf2b.tar.gz | |
Remove more leftovers from invalid static calls
Callbacks are now always valid or not valid, there is no in-between.
Diffstat (limited to 'Zend/zend_API.h')
| -rw-r--r-- | Zend/zend_API.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index c76a919db6..7656c2aee1 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -951,7 +951,6 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_exception(int nu ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_error(int num, char *name, zval *arg); ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_exception(int num, char *name, zval *arg); ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int num, char *error); -ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_deprecated(int num, char *error); ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, char *error); #define ZPP_ERROR_OK 0 @@ -1142,14 +1141,11 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha if (!_error) { \ _expected_type = Z_EXPECTED_FUNC; \ _error_code = ZPP_ERROR_WRONG_ARG; \ - break; \ } else { \ _error_code = ZPP_ERROR_WRONG_CALLBACK; \ - break; \ } \ - } else if (UNEXPECTED(_error != NULL)) { \ - zend_wrong_callback_deprecated(_i, _error); \ - } + break; \ + } \ #define Z_PARAM_FUNC_EX(dest_fci, dest_fcc, check_null, separate) \ Z_PARAM_FUNC_EX2(dest_fci, dest_fcc, check_null, separate, separate) |