From: Marcus Boerger <helly@php.net>
Date: Sun, 12 Feb 2006 16:44:36 +0000 (+0000)
Subject: - MFH No more old parameter api usage
X-Git-Tag: php-5.1.3RC1~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b2b9461d48ef723154366baab9446177675c620;p=php

- MFH No more old parameter api usage
---

diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index ac64e094c4..64cc72d60d 100755
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -340,7 +340,7 @@ static void autoload_func_info_dtor(autoload_func_info *alfi)
  Try all registerd autoload function to load the requested class */
 PHP_FUNCTION(spl_autoload_call)
 {
-	zval **class_name, *retval = NULL;
+	zval *class_name, *retval = NULL;
 	int class_name_len;
 	char *func_name, *lc_name;
 	uint func_name_len;
@@ -348,18 +348,18 @@ PHP_FUNCTION(spl_autoload_call)
 	HashPosition function_pos;
 	autoload_func_info *alfi;
 
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &class_name) == FAILURE || Z_TYPE_PP(class_name) != IS_STRING) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &class_name) == FAILURE || Z_TYPE_P(class_name) != IS_STRING) {
 		return;
 	}
 
 	if (SPL_G(autoload_functions)) {
-		class_name_len = Z_STRLEN_PP(class_name);
-		lc_name = zend_str_tolower_dup(Z_STRVAL_PP(class_name), class_name_len);
+		class_name_len = Z_STRLEN_P(class_name);
+		lc_name = zend_str_tolower_dup(Z_STRVAL_P(class_name), class_name_len);
 		zend_hash_internal_pointer_reset_ex(SPL_G(autoload_functions), &function_pos);
 		while(zend_hash_has_more_elements_ex(SPL_G(autoload_functions), &function_pos) == SUCCESS && !EG(exception)) {
 			zend_hash_get_current_key_ex(SPL_G(autoload_functions), &func_name, &func_name_len, &dummy, 0, &function_pos);
 			zend_hash_get_current_data_ex(SPL_G(autoload_functions), (void **) &alfi, &function_pos);
-			zend_call_method(alfi->obj ? &alfi->obj : NULL, alfi->ce, &alfi->func_ptr, func_name, func_name_len, &retval, 1, *class_name, NULL TSRMLS_CC);
+			zend_call_method(alfi->obj ? &alfi->obj : NULL, alfi->ce, &alfi->func_ptr, func_name, func_name_len, &retval, 1, class_name, NULL TSRMLS_CC);
 			if (retval) {
 				zval_ptr_dtor(&retval);					
 			}
@@ -371,7 +371,7 @@ PHP_FUNCTION(spl_autoload_call)
 		efree(lc_name);
 	} else {
 		/* do not use or overwrite &EG(autoload_func) here */
-		zend_call_method_with_1_params(NULL, NULL, NULL, "spl_autoload", NULL, *class_name);
+		zend_call_method_with_1_params(NULL, NULL, NULL, "spl_autoload", NULL, class_name);
 	}
 } /* }}} */
 
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index cc6be1ad24..9b31ea0e68 100755
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -913,11 +913,10 @@ SPL_METHOD(Array, exchangeArray)
     array_init(return_value);
 	zend_hash_copy(HASH_OF(return_value), spl_array_get_hash_table(intern, 0 TSRMLS_CC), (copy_ctor_func_t) zval_add_ref, &tmp, sizeof(zval*));
 	
-	if (ZEND_NUM_ARGS() > 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
-	if (Z_TYPE_PP(array) == IS_OBJECT && intern == (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC))
-	{
+	if (Z_TYPE_PP(array) == IS_OBJECT && intern == (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC)) {
 		zval_ptr_dtor(&intern->array);
 		array = &object;
 		intern->array = object;