From 704a3c4ac44bf0e9c7ec3228464990016a030621 Mon Sep 17 00:00:00 2001 From: Vladimir Kolesnikov Date: Thu, 25 Jul 2013 05:13:29 +0300 Subject: [PATCH] Do not restore stack too many times --- ext/kernel/main.c | 6 +++--- ext/kernel/main.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/kernel/main.c b/ext/kernel/main.c index 08cbecd517..fd829e2475 100644 --- a/ext/kernel/main.c +++ b/ext/kernel/main.c @@ -322,7 +322,7 @@ void phalcon_inherit_not_found(const char *class_name, const char *inherit_name) /** * Parses method parameters with minimum overhead */ -int phalcon_fetch_parameters(int grow_stack, int num_args TSRMLS_DC, int required_args, int optional_args, ...) +int phalcon_fetch_parameters(int num_args TSRMLS_DC, int required_args, int optional_args, ...) { va_list va; int arg_count = (int) (zend_uintptr_t) *(zend_vm_stack_top(TSRMLS_C) - 1); @@ -330,12 +330,12 @@ int phalcon_fetch_parameters(int grow_stack, int num_args TSRMLS_DC, int require int i; if (num_args < required_args || (num_args > (required_args + optional_args))) { - phalcon_throw_exception_string(spl_ce_BadMethodCallException, SL("Wrong number of parameters"), grow_stack TSRMLS_CC); + phalcon_throw_exception_string(spl_ce_BadMethodCallException, SL("Wrong number of parameters"), 0 TSRMLS_CC); return FAILURE; } if (num_args > arg_count) { - phalcon_throw_exception_string(spl_ce_BadMethodCallException, SL("Could not obtain parameters for parsing"), grow_stack TSRMLS_CC); + phalcon_throw_exception_string(spl_ce_BadMethodCallException, SL("Could not obtain parameters for parsing"), 0 TSRMLS_CC); return FAILURE; } diff --git a/ext/kernel/main.h b/ext/kernel/main.h index fe687c09e7..008ce6a5fb 100644 --- a/ext/kernel/main.h +++ b/ext/kernel/main.h @@ -68,7 +68,7 @@ extern void phalcon_inherit_not_found(const char *class_name, const char *inheri extern int phalcon_is_iterable_ex(zval *arr, HashTable **arr_hash, HashPosition *hash_position, int duplicate, int reverse); /* Fetch Parameters */ -extern int phalcon_fetch_parameters(int grow_stack, int num_args TSRMLS_DC, int required_args, int optional_args, ...); +extern int phalcon_fetch_parameters(int num_args TSRMLS_DC, int required_args, int optional_args, ...); /* Compatibility with PHP 5.3 */ #ifndef ZVAL_COPY_VALUE @@ -316,7 +316,7 @@ extern int phalcon_fetch_parameters(int grow_stack, int num_args TSRMLS_DC, int /** Low overhead parse/fetch parameters */ #define phalcon_fetch_params(memory_grow, required_params, optional_params, ...) \ - if (phalcon_fetch_parameters(memory_grow, ZEND_NUM_ARGS() TSRMLS_CC, required_params, optional_params, __VA_ARGS__) == FAILURE) { \ + if (phalcon_fetch_parameters(ZEND_NUM_ARGS() TSRMLS_CC, required_params, optional_params, __VA_ARGS__) == FAILURE) { \ if (memory_grow) { \ RETURN_MM_NULL(); \ } else { \