Index: ext/standard/array.c
===================================================================
RCS file: /repository/php-src/ext/standard/array.c,v
retrieving revision 1.308.2.21.2.10
diff -u -p -d -r1.308.2.21.2.10 array.c
--- ext/standard/array.c	6 Sep 2006 17:25:57 -0000	1.308.2.21.2.10
+++ ext/standard/array.c	19 Sep 2006 08:24:02 -0000
@@ -1131,32 +1131,28 @@ static int php_array_walk(HashTable *tar
    Apply a user function to every member of an array */
 PHP_FUNCTION(array_walk)
 {
-	int	argc;
-	zval **array,
-		 **userdata = NULL,
+	zval *array,
+		 *userdata = NULL,
+		 *tmp,
 		 **old_walk_func_name;
 	HashTable *target_hash;
 
-	argc = ZEND_NUM_ARGS();
 	old_walk_func_name = BG(array_walk_func_name);
-	if (argc < 2 || argc > 3 ||
-		zend_get_parameters_ex(argc, &array, &BG(array_walk_func_name), &userdata) == FAILURE) {
-		BG(array_walk_func_name) = old_walk_func_name;
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "az|z", &array, &tmp, &userdata) == FAILURE) {
+		return;
 	}
-	target_hash = HASH_OF(*array);
+	target_hash = HASH_OF(array);
 	if (!target_hash) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "The argument should be an array");
-		BG(array_walk_func_name) = old_walk_func_name;
 		RETURN_FALSE;
 	}
-	if (Z_TYPE_PP(BG(array_walk_func_name)) != IS_ARRAY && 
-		Z_TYPE_PP(BG(array_walk_func_name)) != IS_STRING) {
+	if (Z_TYPE_P(tmp) != IS_ARRAY && Z_TYPE_P(tmp) != IS_STRING) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Wrong syntax for function name");
-		BG(array_walk_func_name) = old_walk_func_name;
 		RETURN_FALSE;
+	} else {
+		BG(array_walk_func_name) = &tmp;
 	}
-	php_array_walk(target_hash, userdata, 0 TSRMLS_CC);
+	php_array_walk(target_hash, userdata ? &userdata: NULL, 0 TSRMLS_CC);
 	BG(array_walk_func_name) = old_walk_func_name;
 	RETURN_TRUE;
 }
@@ -1166,32 +1162,28 @@ PHP_FUNCTION(array_walk)
    Apply a user function recursively to every member of an array */
 PHP_FUNCTION(array_walk_recursive)
 {
-	int	argc;
-	zval **array,
-		 **userdata = NULL,
+	zval *array,
+		 *userdata = NULL,
+		 *tmp,
 		 **old_walk_func_name;
 	HashTable *target_hash;
 
-	argc = ZEND_NUM_ARGS();
 	old_walk_func_name = BG(array_walk_func_name);
-
-	if (argc < 2 || argc > 3 ||
-		zend_get_parameters_ex(argc, &array, &BG(array_walk_func_name), &userdata) == FAILURE) {
-		BG(array_walk_func_name) = old_walk_func_name;
-		WRONG_PARAM_COUNT;
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "az|z", &array, &tmp, &userdata) == FAILURE) {
+		return;
 	}
-	target_hash = HASH_OF(*array);
+	target_hash = HASH_OF(array);
 	if (!target_hash) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "The argument should be an array");
-		BG(array_walk_func_name) = old_walk_func_name;
 		RETURN_FALSE;
 	}
-	if (Z_TYPE_PP(BG(array_walk_func_name)) != IS_ARRAY && Z_TYPE_PP(BG(array_walk_func_name)) != IS_STRING) {
+	if (Z_TYPE_P(tmp) != IS_ARRAY && Z_TYPE_P(tmp) != IS_STRING) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Wrong syntax for function name");
-		BG(array_walk_func_name) = old_walk_func_name;
 		RETURN_FALSE;
+	} else {
+		BG(array_walk_func_name) = &tmp;
 	}
-	php_array_walk(target_hash, userdata, 1 TSRMLS_CC);
+	php_array_walk(target_hash, userdata ? &userdata : NULL, 1 TSRMLS_CC);
 	BG(array_walk_func_name) = old_walk_func_name;
 	RETURN_TRUE;
 }