Get rid of more TSRMLS_FETCH's

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 0bab090c5a9303263b799029fe12e0389f4333c9..2de112725e4477c9590a773a890f8a3bc1dffa6a 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -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;

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index db392d7ae69a0ee90c2d704a9a7eaf74b50376a8..f7039c85747ce2b1519eda755c8ace32e1155db8 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -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 */