diff options
| author | Olivier Hill <ohill@php.net> | 2008-06-20 18:05:45 +0000 |
|---|---|---|
| committer | Olivier Hill <ohill@php.net> | 2008-06-20 18:05:45 +0000 |
| commit | dc4bcc901b834c98067300f39372eabb45629e5d (patch) | |
| tree | 28ee5a35ebc54b42c9b25886c620ba14185865b1 | |
| parent | ea00fea83dc6db655f04e42f07ca84bbdae59528 (diff) | |
| download | php-git-dc4bcc901b834c98067300f39372eabb45629e5d.tar.gz | |
- New parameter parsing API for var.c & tests
| -rw-r--r-- | ext/standard/tests/general_functions/debug_zval_dump_e.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/general_functions/var_dump.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/var.c | 16 |
3 files changed, 6 insertions, 14 deletions
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 7b306978d5..4929362613 100644 --- 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 36defa36b6..a54e4f5667 100644 --- a/ext/standard/tests/general_functions/var_dump.phpt +++ b/ext/standard/tests/general_functions/var_dump.phpt @@ -1909,5 +1909,5 @@ string(9) " *** 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 8b52516776..082fcfb194 100644 --- 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++) { |