Get rid of more TSRMLS_FETCH's

This commit is contained in:
Zeev Suraski 2001-07-30 02:07:52 +00:00
parent 1c25b8dd53
commit 11e5d2f229
2 changed files with 9 additions and 6 deletions

View file

@ -74,12 +74,11 @@ ZEND_API int zend_get_parameters(int ht, int param_count, ...)
}
ZEND_API int zend_get_parameters_array(int ht, int param_count, zval **argument_array)
ZEND_API int _zend_get_parameters_array(int ht, int param_count, zval **argument_array TSRMLS_DC)
{
void **p;
int arg_count;
zval *param_ptr;
TSRMLS_FETCH();
p = EG(argument_stack).top_element-2;
arg_count = (ulong) *p;
@ -139,11 +138,10 @@ ZEND_API int zend_get_parameters_ex(int param_count, ...)
}
ZEND_API int zend_get_parameters_array_ex(int param_count, zval ***argument_array)
ZEND_API int _zend_get_parameters_array_ex(int param_count, zval ***argument_array TSRMLS_DC)
{
void **p;
int arg_count;
TSRMLS_FETCH();
p = EG(argument_stack).top_element-2;
arg_count = (ulong) *p;

View file

@ -104,9 +104,14 @@
int zend_next_free_module(void);
ZEND_API int zend_get_parameters(int ht, int param_count, ...);
ZEND_API int zend_get_parameters_array(int ht, int param_count, zval **argument_array);
ZEND_API int _zend_get_parameters_array(int ht, int param_count, zval **argument_array TSRMLS_DC);
ZEND_API int zend_get_parameters_ex(int param_count, ...);
ZEND_API int zend_get_parameters_array_ex(int param_count, zval ***argument_array);
ZEND_API int _zend_get_parameters_array_ex(int param_count, zval ***argument_array TSRMLS_DC);
#define zend_get_parameters_array(ht, param_count, argument_array) \
_zend_get_parameters_array(ht, param_count, argument_array TSRMLS_CC)
#define zend_get_parameters_array_ex(param_count, argument_array) \
_zend_get_parameters_array_ex(param_count, argument_array TSRMLS_CC)
/* Parameter parsing API -- andrei */