From: David Coallier <davidc@php.net>
Date: Fri, 20 Jun 2008 20:54:32 +0000 (+0000)
Subject: - New parsing parameter API cleanups
X-Git-Tag: php-5.3.0alpha1~689
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88abc99dc0e47942ab9dbb33c6cf0b0e1979095d;p=php

- New parsing parameter API cleanups
---

diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index 48bdc879df..dd3eb272fc 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -106,8 +106,8 @@ static void php_pack(zval **val, int size, int *map, char *output)
    Takes one or more arguments and packs them into a binary string according to the format argument */
 PHP_FUNCTION(pack)
 {
-	zval ***argv;
-	int argc, i;
+	zval ***argv = NULL;
+	int num_args, i;
 	int currentarg;
 	char *format;
 	int formatlen;
@@ -117,20 +117,10 @@ PHP_FUNCTION(pack)
 	int outputpos = 0, outputsize = 0;
 	char *output;
 
-	argc = ZEND_NUM_ARGS();
-
-	if (argc < 1) {
-		WRONG_PARAM_COUNT;
-	}
-
-	argv = safe_emalloc(argc, sizeof(zval **), 0);
-
-	if (zend_get_parameters_array_ex(argc, argv) == FAILURE) {
-		efree(argv);
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &argv, &num_args) == FAILURE) {
+		return;
 	}
 
-	convert_to_string_ex(argv[0]);
 	format = Z_STRVAL_PP(argv[0]);
 	formatlen = Z_STRLEN_PP(argv[0]);
 
@@ -178,7 +168,7 @@ PHP_FUNCTION(pack)
 			case 'A': 
 			case 'h': 
 			case 'H':
-				if (currentarg >= argc) {
+				if (currentarg >= num_args) {
 					efree(argv);
 					efree(formatcodes);
 					efree(formatargs);
@@ -210,12 +200,12 @@ PHP_FUNCTION(pack)
 			case 'f': 
 			case 'd': 
 				if (arg < 0) {
-					arg = argc - currentarg;
+					arg = num_args - currentarg;
 				}
 
 				currentarg += arg;
 
-				if (currentarg > argc) {
+				if (currentarg > num_args) {
 					efree(argv);
 					efree(formatcodes);
 					efree(formatargs);
@@ -236,8 +226,8 @@ PHP_FUNCTION(pack)
 		formatargs[formatcount] = arg;
 	}
 
-	if (currentarg < argc) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d arguments unused", (argc - currentarg));
+	if (currentarg < num_args) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d arguments unused", (num_args - currentarg));
 	}
 
 	/* Calculate output length and upper bound while processing*/