diff options
| author | Nikita Popov <nikic@php.net> | 2015-03-22 09:24:56 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-03-22 09:25:32 +0100 |
| commit | a50e9d87f265f911f9c76ca0e998588be0bd6eac (patch) | |
| tree | 5f6124306308765010ba3b9621dbab3aab5a8596 /Zend/zend_API.c | |
| parent | ccfd53886f3f9aefc72c18c9a40b8e2b3015955b (diff) | |
| download | php-git-a50e9d87f265f911f9c76ca0e998588be0bd6eac.tar.gz | |
Partially revert "Fix uninitialized value condition"
This reverts commit e874f76096a346c5ee073c8aaf252d916f3be925,
which broke zpp quite mode.
Only the initialization of the "severity" variable is retained.
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 58065d3ab7..6dd7bcae5e 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -711,7 +711,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons if (zend_fcall_info_init(arg, 0, fci, fcc, NULL, &is_callable_error) == SUCCESS) { if (is_callable_error) { *severity = E_STRICT; - zend_wrong_callback_error(E_STRICT, arg_num, is_callable_error); + zend_spprintf(error, 0, "to be a valid callback, %s", is_callable_error); efree(is_callable_error); *spec = spec_walk; return ""; @@ -720,7 +720,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons } else { if (is_callable_error) { *severity = E_EXCEPTION | E_ERROR; - zend_wrong_callback_error(E_EXCEPTION | E_ERROR, arg_num, is_callable_error); + zend_spprintf(error, 0, "to be a valid callback, %s", is_callable_error); efree(is_callable_error); return ""; } else { |