- No more old parameter api usage

diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index e60dcb5676a44997ebb7e784506048eb710f255c..c5ab4a10df8fcfcf947b6e9b50be49772f358726 100755 (executable)
--- 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, class_name_type;
        char *func_name, *lc_name;
        uint func_name_len;
@@ -348,20 +348,20 @@ 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) != (UG(unicode)?IS_UNICODE:IS_STRING)) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &class_name) == FAILURE ||
+           Z_TYPE_P(class_name) != (UG(unicode)?IS_UNICODE:IS_STRING)) {
                return;
        }
 
        if (SPL_G(autoload_functions)) {
-               class_name_type = Z_TYPE_PP(class_name);
-               class_name_len = Z_UNILEN_PP(class_name);
-               lc_name = zend_u_str_tolower_dup(class_name_type, Z_UNIVAL_PP(class_name), Z_UNILEN_PP(class_name));
+               class_name_type = Z_TYPE_P(class_name);
+               class_name_len = Z_UNILEN_P(class_name);
+               lc_name = zend_u_str_tolower_dup(class_name_type, Z_UNIVAL_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);                                 
                        }
@@ -373,7 +373,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 4aa0440d1c0ba4af90f921b2533b521b02dd3c01..45f7a246d2805367720200eb363efb513edf4148 100755 (executable)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -978,7 +978,7 @@ 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))
@@ -1119,18 +1119,18 @@ static void spl_array_method(INTERNAL_FUNCTION_PARAMETERS, char *fname, int fnam
 {
        spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
        HashTable *aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
-       zval tmp, **arg;
+       zval tmp, *arg;
        
        INIT_PZVAL(&tmp);
        Z_TYPE(tmp) = IS_ARRAY;
        Z_ARRVAL(tmp) = aht;
        
        if (use_arg) {
-               if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
+               if (ZEND_NUM_ARGS() != 1 || zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "z", &arg) == FAILURE) {
                        zend_throw_exception(U_CLASS_ENTRY(spl_ce_BadMethodCallException), "Function expects exactly one argument", 0 TSRMLS_CC);
                        return;
                }
-               zend_call_method(NULL, NULL, NULL, fname, fname_len, &return_value, 2, &tmp, *arg TSRMLS_CC);
+               zend_call_method(NULL, NULL, NULL, fname, fname_len, &return_value, 2, &tmp, arg TSRMLS_CC);
        } else {
                zend_call_method(NULL, NULL, NULL, fname, fname_len, &return_value, 1, &tmp, NULL TSRMLS_CC);
        }