From: Zeev Suraski <zeev@php.net>
Date: Mon, 30 Jul 2001 02:07:52 +0000 (+0000)
Subject: Get rid of more TSRMLS_FETCH's
X-Git-Tag: PRE_ENGINE2_SPLIT~209
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11e5d2f22966ff2dff2848e73e38fb87ec55a2c1;p=php

Get rid of more TSRMLS_FETCH's
---

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 0bab090c5a..2de112725e 100644
--- 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 db392d7ae6..f7039c8574 100644
--- 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 */