diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-11-28 10:28:49 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-11-28 10:28:49 +0300 |
| commit | 11384ba77b9ee58beff7a08d230ed277153bb8f4 (patch) | |
| tree | 2506f31e139cbcd62446926067ff7030a721f51b /Zend/zend_API.c | |
| parent | 9a36cb1a07c247766278a888612ecbac812bece9 (diff) | |
| download | php-git-11384ba77b9ee58beff7a08d230ed277153bb8f4.tar.gz | |
Pack EX(num_args) into EX(This).u2.num_args
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index e22b557451..2aff386fb6 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -51,7 +51,7 @@ ZEND_API int zend_get_parameters(int ht, int param_count, ...) /* {{{ */ TSRMLS_FETCH(); param_ptr = ZEND_CALL_ARG(EG(current_execute_data), 1); - arg_count = EG(current_execute_data)->num_args; + arg_count = ZEND_CALL_NUM_ARGS(EG(current_execute_data)); if (param_count>arg_count) { return FAILURE; @@ -87,7 +87,7 @@ ZEND_API int zend_get_parameters_ex(int param_count, ...) /* {{{ */ TSRMLS_FETCH(); param_ptr = ZEND_CALL_ARG(EG(current_execute_data), 1); - arg_count = EG(current_execute_data)->num_args; + arg_count = ZEND_CALL_NUM_ARGS(EG(current_execute_data)); if (param_count>arg_count) { return FAILURE; @@ -111,7 +111,7 @@ ZEND_API int _zend_get_parameters_array_ex(int param_count, zval *argument_array int arg_count; param_ptr = ZEND_CALL_ARG(EG(current_execute_data), 1); - arg_count = EG(current_execute_data)->num_args; + arg_count = ZEND_CALL_NUM_ARGS(EG(current_execute_data)); if (param_count>arg_count) { return FAILURE; @@ -133,7 +133,7 @@ ZEND_API int zend_copy_parameters_array(int param_count, zval *argument_array TS int arg_count; param_ptr = ZEND_CALL_ARG(EG(current_execute_data), 1); - arg_count = EG(current_execute_data)->num_args; + arg_count = ZEND_CALL_NUM_ARGS(EG(current_execute_data)); if (param_count>arg_count) { return FAILURE; @@ -920,7 +920,7 @@ static int zend_parse_va_args(int num_args, const char *type_spec, va_list *va, return FAILURE; } - arg_count = EG(current_execute_data)->num_args; + arg_count = ZEND_CALL_NUM_ARGS(EG(current_execute_data)); if (num_args > arg_count) { zend_error(E_WARNING, "%s(): could not obtain parameters for parsing", |