getParameters -> zend_get_parameters

6 files changed, 39 insertions, 39 deletions

diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index 5f1b1e71e9..46215d4385 100644
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -73,12 +73,12 @@ PHP_FUNCTION(bcadd)
 
 	switch (ARG_COUNT(ht)) {
 		case 2:
-				if (getParameters(ht, 2, &left, &right) == FAILURE) {
+				if (zend_get_parameters(ht, 2, &left, &right) == FAILURE) {
 		        	WRONG_PARAM_COUNT;
     			}
 				break;
 		case 3:
-				if (getParameters(ht, 3, &left, &right, &scale_param) == FAILURE) {
+				if (zend_get_parameters(ht, 3, &left, &right, &scale_param) == FAILURE) {
 		        	WRONG_PARAM_COUNT;
     			}
 				convert_to_long(scale_param);
@@ -116,12 +116,12 @@ PHP_FUNCTION(bcsub)
 
 	switch (ARG_COUNT(ht)) {
 		case 2:
-				if (getParameters(ht, 2, &left, &right) == FAILURE) {
+				if (zend_get_parameters(ht, 2, &left, &right) == FAILURE) {
 		        	WRONG_PARAM_COUNT;
     			}
 				break;
 		case 3:
-				if (getParameters(ht, 3, &left, &right, &scale_param) == FAILURE) {
+				if (zend_get_parameters(ht, 3, &left, &right, &scale_param) == FAILURE) {
 		        	WRONG_PARAM_COUNT;
     			}
 				convert_to_long(scale_param);
@@ -159,12 +159,12 @@ PHP_FUNCTION(bcmul)
 
 	switch (ARG_COUNT(ht)) {
 		case 2:
-				if (getParameters(ht, 2, &left, &right) == FAILURE) {
+				if (zend_get_parameters(ht, 2, &left, &right) == FAILURE) {
 		        	WRONG_PARAM_COUNT;
     			}
 				break;
 		case 3:
-				if (getParameters(ht, 3, &left, &right, &scale_param) == FAILURE) {
+				if (zend_get_parameters(ht, 3, &left, &right, &scale_param) == FAILURE) {
 		        	WRONG_PARAM_COUNT;
     			}
 				convert_to_long(scale_param);
@@ -202,12 +202,12 @@ PHP_FUNCTION(bcdiv)
 
 	switch (ARG_COUNT(ht)) {
 		case 2:
-				if (getParameters(ht, 2, &left, &right) == FAILURE) {
+				if (zend_get_parameters(ht, 2, &left, &right) == FAILURE) {
 		        	WRONG_PARAM_COUNT;
     			}
 				break;
 		case 3:
-				if (getParameters(ht, 3, &left, &right, &scale_param) == FAILURE) {
+				if (zend_get_parameters(ht, 3, &left, &right, &scale_param) == FAILURE) {
 		        	WRONG_PARAM_COUNT;
     			}
 				convert_to_long(scale_param);
@@ -250,7 +250,7 @@ PHP_FUNCTION(bcmod)
 
 	switch (ARG_COUNT(ht)) {
 		case 2:
-				if (getParameters(ht, 2, &left, &right) == FAILURE) {
+				if (zend_get_parameters(ht, 2, &left, &right) == FAILURE) {
 		        	WRONG_PARAM_COUNT;
     			}
 				break;
@@ -292,12 +292,12 @@ PHP_FUNCTION(bcpow)
 
 	switch (ARG_COUNT(ht)) {
 		case 2:
-				if (getParameters(ht, 2, &left, &right) == FAILURE) {
+				if (zend_get_parameters(ht, 2, &left, &right) == FAILURE) {
 		        	WRONG_PARAM_COUNT;
     			}
 				break;
 		case 3:
-				if (getParameters(ht, 3, &left, &right, &scale_param) == FAILURE) {
+				if (zend_get_parameters(ht, 3, &left, &right, &scale_param) == FAILURE) {
 		        	WRONG_PARAM_COUNT;
     			}
 				convert_to_long(scale_param);
@@ -335,12 +335,12 @@ PHP_FUNCTION(bcsqrt)
 
 	switch (ARG_COUNT(ht)) {
 		case 1:
-				if (getParameters(ht, 1, &left) == FAILURE) {
+				if (zend_get_parameters(ht, 1, &left) == FAILURE) {
 		        	WRONG_PARAM_COUNT;
     			}
 				break;
 		case 2:
-				if (getParameters(ht, 2, &left, &scale_param) == FAILURE) {
+				if (zend_get_parameters(ht, 2, &left, &scale_param) == FAILURE) {
 		        	WRONG_PARAM_COUNT;
     			}
 				convert_to_long(scale_param);
@@ -375,12 +375,12 @@ PHP_FUNCTION(bccomp)
 
 	switch (ARG_COUNT(ht)) {
 		case 2:
-				if (getParameters(ht, 2, &left, &right) == FAILURE) {
+				if (zend_get_parameters(ht, 2, &left, &right) == FAILURE) {
 		        	WRONG_PARAM_COUNT;
     			}
 				break;
 		case 3:
-				if (getParameters(ht, 3, &left, &right, &scale_param) == FAILURE) {
+				if (zend_get_parameters(ht, 3, &left, &right, &scale_param) == FAILURE) {
 		        	WRONG_PARAM_COUNT;
     			}
 				convert_to_long(scale_param);
@@ -413,7 +413,7 @@ PHP_FUNCTION(bcscale)
 {
 	pval *new_scale;
 	
-	if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &new_scale)==FAILURE) {
+	if (ARG_COUNT(ht)!=1 || zend_get_parameters(ht, 1, &new_scale)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
diff --git a/ext/db/db.c b/ext/db/db.c
index ce8b35e449..fef238d5a9 100644
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -256,7 +256,7 @@ PHP_FUNCTION(dbmopen) {
 	int ret;
 	DBM_TLS_VARS;
 
-	if (ARG_COUNT(ht)!=2 || getParameters(ht,2,&filename,&mode)==FAILURE) {
+	if (ARG_COUNT(ht)!=2 || zend_get_parameters(ht,2,&filename,&mode)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -412,7 +412,7 @@ dbm_info *php_dbm_open(char *filename, char *mode) {
 PHP_FUNCTION(dbmclose) {
 	pval *id;
 
-	if (ARG_COUNT(ht) != 1 || getParameters(ht,1,&id)==FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters(ht,1,&id)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_long(id);
@@ -463,7 +463,7 @@ PHP_FUNCTION(dbminsert)
 	dbm_info *info;
 	int ret;
 
-	if (ARG_COUNT(ht)!=3||getParameters(ht,3,&id,&key,&value) == FAILURE) {
+	if (ARG_COUNT(ht)!=3||zend_get_parameters(ht,3,&id,&key,&value) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string(key);
@@ -516,7 +516,7 @@ PHP_FUNCTION(dbmreplace)
 	dbm_info *info;
 	int ret;
 
-	if (ARG_COUNT(ht)!=3||getParameters(ht,3,&id,&key,&value) == FAILURE) {
+	if (ARG_COUNT(ht)!=3||zend_get_parameters(ht,3,&id,&key,&value) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string(key);
@@ -571,7 +571,7 @@ PHP_FUNCTION(dbmfetch)
 	pval *id, *key;
 	dbm_info *info;
 
-	if (ARG_COUNT(ht)!=2||getParameters(ht,2,&id,&key)==FAILURE) {
+	if (ARG_COUNT(ht)!=2||zend_get_parameters(ht,2,&id,&key)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string(key);
@@ -643,7 +643,7 @@ PHP_FUNCTION(dbmexists)
 	dbm_info *info;
 	int ret;
 
-	if (ARG_COUNT(ht)!=2||getParameters(ht,2,&id,&key)==FAILURE) {
+	if (ARG_COUNT(ht)!=2||zend_get_parameters(ht,2,&id,&key)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string(key);
@@ -686,7 +686,7 @@ PHP_FUNCTION(dbmdelete)
 	dbm_info *info;
 	int ret;
 
-	if (ARG_COUNT(ht)!=2||getParameters(ht,2,&id,&key)==FAILURE) {
+	if (ARG_COUNT(ht)!=2||zend_get_parameters(ht,2,&id,&key)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string(key);
@@ -728,7 +728,7 @@ PHP_FUNCTION(dbmfirstkey)
 	dbm_info *info;
 	char *ret;
 
-	if (ARG_COUNT(ht)!=1||getParameters(ht,1,&id)==FAILURE) {
+	if (ARG_COUNT(ht)!=1||zend_get_parameters(ht,1,&id)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -785,7 +785,7 @@ PHP_FUNCTION(dbmnextkey)
 	dbm_info *info;
 	char *ret;
 
-	if (ARG_COUNT(ht)!=2||getParameters(ht,2,&id,&key)==FAILURE) {
+	if (ARG_COUNT(ht)!=2||zend_get_parameters(ht,2,&id,&key)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string(key);
diff --git a/ext/gd/gdt1.c b/ext/gd/gdt1.c
index fc46d97871..aede639d64 100644
--- a/ext/gd/gdt1.c
+++ b/ext/gd/gdt1.c
@@ -38,7 +38,7 @@ PHP_FUNCTION(imagepsloadfont)
 	int l_ind;
 	gd_ps_font *f_ind;
 
-	if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &file) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters(ht, 1, &file) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -84,7 +84,7 @@ PHP_FUNCTION(imagepscopyfont)
 	int l_ind, type;
 	gd_ps_font *nf_ind, *of_ind;
 
-	if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &fnt) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters(ht, 1, &fnt) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -137,7 +137,7 @@ PHP_FUNCTION(imagepsfreefont)
 	pval *fnt;
 	int type;
 
-	if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &fnt) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters(ht, 1, &fnt) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -164,7 +164,7 @@ PHP_FUNCTION(imagepsencodefont)
 	int type;
 	gd_ps_font *f_ind;
 
-	if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &fnt, &enc) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters(ht, 2, &fnt, &enc) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -202,7 +202,7 @@ PHP_FUNCTION(imagepsextendfont)
 	int type;
 	gd_ps_font *f_ind;
 
-	if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &fnt, &ext) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters(ht, 2, &fnt, &ext) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -230,7 +230,7 @@ PHP_FUNCTION(imagepsslantfont)
 	int type;
 	gd_ps_font*f_ind;
 
-	if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &fnt, &slt) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters(ht, 2, &fnt, &slt) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -272,7 +272,7 @@ PHP_FUNCTION(imagepstext)
 
 	switch(ARG_COUNT(ht)) {
 	case 8:
-		if (getParameters(ht, 8, &img, &str, &fnt, &sz, &fg, &bg, &px, &py) == FAILURE) {
+		if (zend_get_parameters(ht, 8, &img, &str, &fnt, &sz, &fg, &bg, &px, &py) == FAILURE) {
 			RETURN_FALSE;
 		}
 		convert_to_string(str);
@@ -290,7 +290,7 @@ PHP_FUNCTION(imagepstext)
 		angle = 0;
 		break;
 	case 12:
-		if (getParameters(ht, 12, &img, &str, &fnt, &sz, &fg, &bg, &px, &py, &sp, &wd, &ang, &aas) == FAILURE) {
+		if (zend_get_parameters(ht, 12, &img, &str, &fnt, &sz, &fg, &bg, &px, &py, &sp, &wd, &ang, &aas) == FAILURE) {
 			RETURN_FALSE;
 		}
 		convert_to_string(str);
@@ -433,7 +433,7 @@ PHP_FUNCTION(imagepsbbox)
 
 	switch(ARG_COUNT(ht)) {
 	case 3:
-		if (getParameters(ht, 3, &str, &fnt, &sz) == FAILURE) {
+		if (zend_get_parameters(ht, 3, &str, &fnt, &sz) == FAILURE) {
 			RETURN_FALSE;
 		}
 		convert_to_string(str);
@@ -442,7 +442,7 @@ PHP_FUNCTION(imagepsbbox)
 		space = 0;
 		break;
 	case 6:
-		if (getParameters(ht, 6, &str, &fnt, &sz, &sp, &wd, &ang) == FAILURE) {
+		if (zend_get_parameters(ht, 6, &str, &fnt, &sz, &sp, &wd, &ang) == FAILURE) {
 			RETURN_FALSE;
 		}
 		convert_to_string(str);
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 86bfddab38..981de17212 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1044,7 +1044,7 @@ PHP_FUNCTION(register_shutdown_function)
 	}
 	shutdown_function_entry.arguments = (pval **) emalloc(sizeof(pval *)*shutdown_function_entry.arg_count);
 
-	if (getParametersArray(ht, shutdown_function_entry.arg_count, shutdown_function_entry.arguments)==FAILURE) {
+	if (zend_get_parameters_array(ht, shutdown_function_entry.arg_count, shutdown_function_entry.arguments)==FAILURE) {
 		RETURN_FALSE;
 	}	
 	convert_to_string(shutdown_function_entry.arguments[0]);
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index f78726c516..d5b8d7e9b1 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -236,7 +236,7 @@ PHP_FUNCTION(getmxrr)
 
 	switch(ARG_COUNT(ht)) {
 	case 2:
-		if (getParameters(ht, 2, &host, &mx_list) == FAILURE) {
+		if (zend_get_parameters(ht, 2, &host, &mx_list) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		if (!ParameterPassedByReference(ht, 2)) {
@@ -245,7 +245,7 @@ PHP_FUNCTION(getmxrr)
 		}
         break;
     case 3:
-		if (getParameters(ht, 3, &host, &mx_list, &weight_list) == FAILURE) {
+		if (zend_get_parameters(ht, 3, &host, &mx_list, &weight_list) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		if (!ParameterPassedByReference(ht, 2) || !ParameterPassedByReference(ht, 3)) {
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 0dae49bb9c..63a3ea4f77 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -882,7 +882,7 @@ PHP_FUNCTION(set_socket_timeout)
 	int type, *sock;
 	struct timeval t;
 
-	if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &socket, &timeout)==FAILURE) {
+	if (ARG_COUNT(ht)!=2 || zend_get_parameters(ht, 2, &socket, &timeout)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_long(socket);