diff options
| -rw-r--r-- | Zend/zend_API.c | 18 | ||||
| -rw-r--r-- | Zend/zend_API.h | 5 | ||||
| -rw-r--r-- | Zend/zend_builtin_functions.c | 3 | ||||
| -rw-r--r-- | Zend/zend_modules.h | 3 |
4 files changed, 3 insertions, 26 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 6a396c9eba..e546f62670 100644 --- 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 39a81d87db..31a7261029 100644 --- 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 4b13075058..11cf531837 100644 --- 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 b3d385a68d..0841130c59 100644 --- 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 |