- New parameter parsing API for var.c & tests

diff --git a/ext/standard/tests/general_functions/debug_zval_dump_e.phpt b/ext/standard/tests/general_functions/debug_zval_dump_e.phpt
index 7b306978d572aac899addfaca7638ce7920452d0..49293626130fe5ef45822445e003ac409bb617ad 100644 (file)
--- a/ext/standard/tests/general_functions/debug_zval_dump_e.phpt
+++ b/ext/standard/tests/general_functions/debug_zval_dump_e.phpt
@@ -19,5 +19,5 @@ echo "Done\n";
 --EXPECTF--
 *** Testing error conditions ***
 
-Warning: Wrong parameter count for debug_zval_dump() in %s on line %d
+Warning: debug_zval_dump() expects at least %d parameter, %d given in %s on line %d
 Done

diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt
index 36defa36b65a550c789bd4c47828a12ec89feda1..a54e4f566721ebf10899a9d503796b6237a34449 100644 (file)
--- a/ext/standard/tests/general_functions/var_dump.phpt
+++ b/ext/standard/tests/general_functions/var_dump.phpt
@@ -1909,5 +1909,5 @@ string(9) "\0lambda_2"
 
 *** Testing error conditions ***
 
-Warning: Wrong parameter count for var_dump() in %s on line %d
+Warning: var_dump() expects at least %d parameter, %d given in %s on line %d
 Done

diff --git a/ext/standard/var.c b/ext/standard/var.c
index 8b525167766ee04f67bc1113a9c0f0fc8680914b..082fcfb1948008e876e664dec765ea32c9e79109 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -172,12 +172,8 @@ PHP_FUNCTION(var_dump)
        int argc;
        int     i;
 
-       argc = ZEND_NUM_ARGS();
-
-       args = (zval ***)safe_emalloc(argc, sizeof(zval **), 0);
-       if (ZEND_NUM_ARGS() == 0 || zend_get_parameters_array_ex(argc, args) == FAILURE) {
-               efree(args);
-               WRONG_PARAM_COUNT;
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &argc) == FAILURE) {
+               return;
        }
 
        for (i = 0; i < argc; i++) {
@@ -328,12 +324,8 @@ PHP_FUNCTION(debug_zval_dump)
        int argc;
        int     i;
 
-       argc = ZEND_NUM_ARGS();
-
-       args = (zval ***)safe_emalloc(argc, sizeof(zval **), 0);
-       if (ZEND_NUM_ARGS() == 0 || zend_get_parameters_array_ex(argc, args) == FAILURE) {
-               efree(args);
-               WRONG_PARAM_COUNT;
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &argc) == FAILURE) {
+               return;
        }
 
        for (i = 0; i < argc; i++) {