archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- New parameter parsing API for var.c & tests

Browse source
This commit is contained in:
Olivier Hill 2008-06-20 18:05:45 +00:00
parent ea00fea83d
commit dc4bcc901b
3 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/standard/tests/general_functions/debug_zval_dump_e.phpt
View file

@ -19,5 +19,5 @@ echo "Done\n";
--EXPECTF-- --EXPECTF--
*** Testing error conditions *** *** 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 Done

2
ext/standard/tests/general_functions/var_dump.phpt
View file

@ -1909,5 +1909,5 @@ string(9) "lambda_2"
*** Testing error conditions *** *** 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 Done

16
ext/standard/var.c
View file

@ -172,12 +172,8 @@ PHP_FUNCTION(var_dump)
int argc; int argc;
int i; int i;
argc = ZEND_NUM_ARGS(); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &argc) == FAILURE) {
return;
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;
} }
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
@ -328,12 +324,8 @@ PHP_FUNCTION(debug_zval_dump)
int argc; int argc;
int i; int i;
argc = ZEND_NUM_ARGS(); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &argc) == FAILURE) {
return;
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;
} }
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {