- Introduce ZEND_NUM_ARGS(), to replace ARG_COUNT(ht)

- Rename getParameters() and friends for consistency and namespace cleanliness

4 files changed, 31 insertions, 30 deletions

diff --git a/Zend/zend.h b/Zend/zend.h
index 0ef98ee46a..34a01cf6c5 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -96,8 +96,8 @@ typedef unsigned char zend_bool;
 #include "zend_hash.h"
 #include "zend_llist.h"
 
-#define INTERNAL_FUNCTION_PARAMETERS int ht, zval *return_value, HashTable *list, HashTable *plist, zval *this_ptr, int return_value_used
-#define INTERNAL_FUNCTION_PARAM_PASSTHRU ht, return_value, list, plist, this_ptr, return_value_used
+#define INTERNAL_FUNCTION_PARAMETERS int num_args, zval *return_value, HashTable *list, HashTable *plist, zval *this_ptr, int return_value_used
+#define INTERNAL_FUNCTION_PARAM_PASSTHRU num_args, return_value, list, plist, this_ptr, return_value_used
 
 /*
  * zval
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 912811eb44..f0efa2baed 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -35,7 +35,7 @@ static int module_count=0;
 HashTable list_destructors, module_registry;
 
 /* this function doesn't check for too many parameters */
-ZEND_API int getParameters(int ht, int param_count,...)
+ZEND_API int zend_get_parameters(int ht, int param_count,...)
 {
 	void **p;
 	int arg_count;
@@ -75,7 +75,7 @@ ZEND_API int getParameters(int ht, int param_count,...)
 }
 
 
-ZEND_API int getParametersArray(int ht, int param_count, zval **argument_array)
+ZEND_API int zend_get_parameters_array(int ht, int param_count, zval **argument_array)
 {
 	void **p;
 	int arg_count;
@@ -115,7 +115,7 @@ ZEND_API int getParametersArray(int ht, int param_count, zval **argument_array)
 
 /* Zend-optimized Extended functions */
 /* this function doesn't check for too many parameters */
-ZEND_API int getParametersEx(int param_count,...)
+ZEND_API int zend_get_parameters_ex(int param_count,...)
 {
 	void **p;
 	int arg_count;
@@ -141,7 +141,7 @@ ZEND_API int getParametersEx(int param_count,...)
 }
 
 
-ZEND_API int getParametersArrayEx(int param_count, zval ***argument_array)
+ZEND_API int zend_get_parameters_array_ex(int param_count, zval ***argument_array)
 {
 	void **p;
 	int arg_count;
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index c5d7460600..e76e970b67 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -56,10 +56,10 @@
 
 int zend_next_free_module(void);
 
-ZEND_API int getParameters(int ht, int param_count,...);
-ZEND_API int getParametersArray(int ht, int param_count, zval **argument_array);
-ZEND_API int getParametersEx(int param_count,...);
-ZEND_API int getParametersArrayEx(int param_count, zval ***argument_array);
+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_ex(int param_count,...);
+ZEND_API int zend_get_parameters_array_ex(int param_count, zval ***argument_array);
 
 ZEND_API int ParameterPassedByReference(int ht, uint n);
 
@@ -75,7 +75,8 @@ ZEND_API void wrong_param_count(void);
 
 #define WRONG_PARAM_COUNT { wrong_param_count(); return; }
 #define WRONG_PARAM_COUNT_WITH_RETVAL(ret) { wrong_param_count(); return ret; }
-#define ARG_COUNT(ht) (ht)
+#define ARG_COUNT(dummy)	(num_args)
+#define ZEND_NUM_ARGS()		(num_args)
 
 #define BYREF_NONE 0
 #define BYREF_FORCE 1
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 45828bff70..30eb342ff1 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -113,7 +113,7 @@ ZEND_FUNCTION(func_get_arg)
 	long requested_offset;
 	ELS_FETCH();
 
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &z_requested_offset)==FAILURE) {
+	if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &z_requested_offset)==FAILURE) {
 		RETURN_FALSE;
 	}
 	convert_to_long_ex(z_requested_offset);
@@ -177,7 +177,7 @@ ZEND_FUNCTION(strlen)
 {
 	zval **str;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
@@ -191,7 +191,7 @@ ZEND_FUNCTION(strcmp)
 {
 	zval **s1, **s2;
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &s1, &s2) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &s1, &s2) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(s1);
@@ -206,7 +206,7 @@ ZEND_FUNCTION(strcasecmp)
 {
 	zval **s1, **s2;
 	
-	if (ARG_COUNT(ht)!=2 || getParametersEx(2, &s1, &s2) == FAILURE) {
+	if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &s1, &s2) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(s1);
@@ -223,7 +223,7 @@ ZEND_FUNCTION(each)
 	zval **inserted_pointer;
 	HashTable *target_hash;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	target_hash = HASH_OF(*array);
@@ -272,11 +272,11 @@ ZEND_FUNCTION(error_reporting)
 	ELS_FETCH();
 
 	old_error_reporting = EG(error_reporting);
-	switch (ARG_COUNT(ht)) {
+	switch (ZEND_NUM_ARGS()) {
 		case 0:
 			break;
 		case 1:
-			if (getParametersEx(1,&arg) == FAILURE) {
+			if (zend_get_parameters_ex(1,&arg) == FAILURE) {
 				RETURN_FALSE;
 			}
 			convert_to_long_ex(arg);
@@ -297,15 +297,15 @@ ZEND_FUNCTION(define)
 	zend_constant c;
 	ELS_FETCH();
 	
-	switch(ARG_COUNT(ht)) {
+	switch(ZEND_NUM_ARGS()) {
 		case 2:
-			if (getParametersEx(2, &var, &val)==FAILURE) {
+			if (zend_get_parameters_ex(2, &var, &val)==FAILURE) {
 				RETURN_FALSE;
 			}
 			case_sensitive = CONST_CS;
 			break;
 		case 3:
-			if (getParametersEx(3, &var, &val, &non_cs)==FAILURE) {
+			if (zend_get_parameters_ex(3, &var, &val, &non_cs)==FAILURE) {
 				RETURN_FALSE;
 			}
 			convert_to_long_ex(non_cs);
@@ -348,7 +348,7 @@ ZEND_FUNCTION(defined)
 	zval **var;
 	zval c;
 		
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &var)==FAILURE) {
+	if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &var)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -368,7 +368,7 @@ ZEND_FUNCTION(get_class)
 {
 	zval **arg;
 	
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &arg)==FAILURE) {
+	if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &arg)==FAILURE) {
 		RETURN_FALSE;
 	}
 	if ((*arg)->type != IS_OBJECT) {
@@ -385,7 +385,7 @@ ZEND_FUNCTION(get_parent_class)
 {
 	zval **arg;
 	
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &arg)==FAILURE) {
+	if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &arg)==FAILURE) {
 		RETURN_FALSE;
 	}
 	if (((*arg)->type != IS_OBJECT) || !(*arg)->value.obj.ce->parent) {
@@ -404,7 +404,7 @@ ZEND_FUNCTION(is_subclass_of)
 	zend_class_entry *parent_ce = NULL;
 	CLS_FETCH();
 
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &obj, &class_name)==FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &obj, &class_name)==FAILURE) {
 		RETURN_FALSE;
 	}
 
@@ -435,7 +435,7 @@ ZEND_FUNCTION(method_exists)
 	zval **klass, **method_name;
 	char *lcname;
 	
-	if (ARG_COUNT(ht)!=2 || getParametersEx(2, &klass, &method_name)==FAILURE) {
+	if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &klass, &method_name)==FAILURE) {
 		RETURN_FALSE;
 	}
 	if ((*klass)->type != IS_OBJECT) {
@@ -463,7 +463,7 @@ ZEND_FUNCTION(class_exists)
 	char *lcname;
 	CLS_FETCH();
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &class_name)==FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &class_name)==FAILURE) {
 		RETURN_FALSE;
 	}
 	convert_to_string_ex(class_name);
@@ -487,7 +487,7 @@ ZEND_FUNCTION(function_exists)
 	char *lcname;
 	CLS_FETCH();
 	
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &function_name)==FAILURE) {
+	if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &function_name)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(function_name);
@@ -508,8 +508,8 @@ ZEND_FUNCTION(leak)
 	int leakbytes=3;
 	zval **leak;
 
-	if (ARG_COUNT(ht)>=1) {
-		if (getParametersEx(1, &leak)==SUCCESS) {
+	if (ZEND_NUM_ARGS()>=1) {
+		if (zend_get_parameters_ex(1, &leak)==SUCCESS) {
 			convert_to_long_ex(leak);
 			leakbytes = (*leak)->value.lval;
 		}