More TSRMLS_FETCH work, and get rid of redundant ParametersPassedByRef

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 6a396c9ebaca2021fbabf5b81790a5b4ca7e65f6..e546f626707a4fa2751910d1f37599ff4634ce56 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -158,24 +158,6 @@ ZEND_API int _zend_get_parameters_array_ex(int param_count, zval ***argument_arr
 }
 
 
-ZEND_API int ParameterPassedByReference(int ht, uint n)
-{
-       void **p;
-       ulong arg_count;
-       zval *arg;
-       TSRMLS_FETCH();
-
-       p = EG(argument_stack).elements+EG(argument_stack).top-2;
-       arg_count = (ulong) *p;
-
-       if (n>arg_count) {
-               return FAILURE;
-       }
-       arg = (zval *) *(p-arg_count+n-1);
-       return PZVAL_IS_REF(arg);
-}
-
-
 ZEND_API void wrong_param_count()
 {
        zend_error(E_WARNING,"Wrong parameter count for %s()",get_active_function_name());

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 39a81d87dba1b58bccd94dfdb3a5420505eb5e8f..31a72610296f50ac9f56ad261e91283c98704f5d 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -120,10 +120,7 @@ ZEND_API int _zend_get_parameters_array_ex(int param_count, zval ***argument_arr
 ZEND_API int zend_parse_parameters(int num_args TSRMLS_DC, char *type_spec, ...);
 ZEND_API int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, char *type_spec, ...);
 
-/* Parameter parsing API -- andrei */
-
-
-ZEND_API int ParameterPassedByReference(int ht, uint n);
+/* End of parameter parsing API -- andrei */
 
 int zend_register_functions(zend_function_entry *functions, HashTable *function_table, int type TSRMLS_DC);
 void zend_unregister_functions(zend_function_entry *functions, int count, HashTable *function_table TSRMLS_DC);

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 4b13075058f424fbaa4f3471cfa261216bb7e2b7..11cf531837e37022d10900284121cb495b2dac76 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -69,9 +69,8 @@ static ZEND_FUNCTION(zend_test_func);
 #endif
 
 ZEND_API unsigned char first_arg_force_ref[] = { 1, BYREF_FORCE };
-ZEND_API unsigned char first_arg_allow_ref[] = { 1, BYREF_ALLOW };
 ZEND_API unsigned char second_arg_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE };
-ZEND_API unsigned char second_arg_allow_ref[] = { 2, BYREF_NONE, BYREF_ALLOW };
+ZEND_API unsigned char third_arg_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };
 
 static zend_function_entry builtin_functions[] = {
        ZEND_FE(zend_version,           NULL)

diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
index b3d385a68da39274816147175e807d80ee347a58..0841130c59d65057089eaa268dcdaf99a9238a02 100644 (file)
--- a/Zend/zend_modules.h
+++ b/Zend/zend_modules.h
@@ -33,9 +33,8 @@
 #define GINIT_FUNC_ARGS_PASSTHRU
 
 ZEND_API extern unsigned char first_arg_force_ref[];
-ZEND_API extern unsigned char first_arg_allow_ref[];
 ZEND_API extern unsigned char second_arg_force_ref[];
-ZEND_API extern unsigned char second_arg_allow_ref[];
+ZEND_API extern unsigned char third_arg_force_ref[];
 
 #define ZEND_MODULE_API_NO 20001222
 #ifdef ZTS