Permalink
Browse files

Get rid of more TSRMLS_FETCH's

  • Loading branch information...
1 parent 1c25b8d commit 11e5d2f22966ff2dff2848e73e38fb87ec55a2c1 @zsuraski zsuraski committed Jul 30, 2001
Showing with 9 additions and 6 deletions.
  1. +2 −4 Zend/zend_API.c
  2. +7 −2 Zend/zend_API.h
View
@@ -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
@@ -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 */

0 comments on commit 11e5d2f

Please sign in to comment.