cvs: php-src(PHP_5_3) /ext/standard ftok.c image.c info.c pack.c quot_print.c streamsfuncs.c var.c /ext/standard/tests/file stream_rfc2397_002.phpt
/ext/standard/tests/general_functions floatval.phpt gettype_settype_error.phpt strval.phpt /ext/standard/tests/serialize serialization_error_001.phpt
/ext/standard/tests/streams stream_get_meta_data_file_error.phpt stream_set_timeout_error.phpt
| From: | Felipe Pena | Date: | Fri, 20 Jun 2008 14:53:57 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/standard ftok.c image.c info.c pack.c quot_print.c streamsfuncs.c var.c /ext/standard/tests/file stream_rfc2397_002.phpt /ext/standard/tests/general_functions floatval.phpt gettype_settype_error.phpt strval.phpt /ext/standard/tests/serialize serialization_error_001.phpt /ext/standard/tests/streams stream_get_meta_data_file_error.phpt stream_set_timeout_error.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-50508@lists.php.net to get a copy of this message | ||
felipe Fri Jun 20 14:53:57 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard ftok.c image.c info.c pack.c quot_print.c
streamsfuncs.c var.c
/php-src/ext/standard/tests/file stream_rfc2397_002.phpt
/php-src/ext/standard/tests/general_functions floatval.phpt
gettype_settype_error.phpt
strval.phpt
/php-src/ext/standard/tests/serialize serialization_error_001.phpt
/php-src/ext/standard/tests/streams
stream_get_meta_data_file_error.phpt
stream_set_timeout_error.phpt
Log:
- New parameter parsing API
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftok.c?r1=1.16.2.1.2.1.2.1&r2=1.16.2.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/ftok.c diff -u php-src/ext/standard/ftok.c:1.16.2.1.2.1.2.1 php-src/ext/standard/ftok.c:1.16.2.1.2.1.2.2 --- php-src/ext/standard/ftok.c:1.16.2.1.2.1.2.1 Mon Dec 31 07:17:15 2007 +++ php-src/ext/standard/ftok.c Fri Jun 20 14:53:57 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ftok.c,v 1.16.2.1.2.1.2.1 2007/12/31 07:17:15 sebastian Exp $ */ +/* $Id: ftok.c,v 1.16.2.1.2.1.2.2 2008/06/20 14:53:57 felipe Exp $ */ #include "php.h" @@ -31,31 +31,29 @@ Convert a pathname and a project identifier to a System V IPC key */ PHP_FUNCTION(ftok) { - zval **pathname, **proj; + char *pathname, *proj; + int pathname_len, proj_len; key_t k; - if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pathname, &proj) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, &pathname, &pathname_len, &proj, &proj_len) == FAILURE) { + return; } - convert_to_string_ex(pathname); - convert_to_string_ex(proj); - - if (Z_STRLEN_PP(pathname)==0){ + if (pathname_len == 0){ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Pathname is invalid"); RETURN_LONG(-1); } - if (Z_STRLEN_PP(proj)!=1){ + if (proj_len != 1){ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Project identifier is invalid"); RETURN_LONG(-1); } - if ((PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(pathname), NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(Z_STRVAL_PP(pathname) TSRMLS_CC)) { + if ((PG(safe_mode) && (!php_checkuid(pathname, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(pathname TSRMLS_CC)) { RETURN_LONG(-1); } - k = ftok(Z_STRVAL_PP(pathname),Z_STRVAL_PP(proj)[0]); + k = ftok(pathname, proj[0]); if (k == -1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "ftok() failed - %s", strerror(errno)); } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/image.c?r1=1.114.2.2.2.5.2.4&r2=1.114.2.2.2.5.2.5&diff_format=u Index: php-src/ext/standard/image.c diff -u php-src/ext/standard/image.c:1.114.2.2.2.5.2.4 php-src/ext/standard/image.c:1.114.2.2.2.5.2.5 --- php-src/ext/standard/image.c:1.114.2.2.2.5.2.4 Sat May 24 11:53:55 2008 +++ php-src/ext/standard/image.c Fri Jun 20 14:53:57 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.114.2.2.2.5.2.4 2008/05/24 11:53:55 helly Exp $ */ +/* $Id: image.c,v 1.114.2.2.2.5.2.5 2008/06/20 14:53:57 felipe Exp $ */ #include "php.h" #include <stdio.h> @@ -1160,15 +1160,13 @@ Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype */ PHP_FUNCTION(image_type_to_mime_type) { - zval **p_image_type; - int arg_c = ZEND_NUM_ARGS(); + long p_image_type; - if ((arg_c!=1) || zend_get_parameters_ex(arg_c, &p_image_type) == FAILURE) { - RETVAL_FALSE; - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &p_image_type) == FAILURE) { + return; } - convert_to_long_ex(p_image_type); - ZVAL_STRING(return_value, (char*)php_image_type_to_mime_type(Z_LVAL_PP(p_image_type)), 1); + + ZVAL_STRING(return_value, (char*)php_image_type_to_mime_type(p_image_type), 1); } /* }}} */ @@ -1300,40 +1298,22 @@ Get the size of an image as 4-element array */ PHP_FUNCTION(getimagesize) { - zval **arg1, **info = NULL; - int itype = 0; - char *temp; + zval **info = NULL; + char *arg1, *temp; + int arg1_len, itype = 0, argc = ZEND_NUM_ARGS(); struct gfxinfo *result = NULL; php_stream * stream = NULL; - switch(ZEND_NUM_ARGS()) { - - case 1: - if (zend_get_parameters_ex(1, &arg1) == FAILURE) { - RETVAL_FALSE; - WRONG_PARAM_COUNT; - } - convert_to_string_ex(arg1); - break; - - case 2: - if (zend_get_parameters_ex(2, &arg1, &info) == FAILURE) { - RETVAL_FALSE; - WRONG_PARAM_COUNT; - } + if (zend_parse_parameters(argc TSRMLS_CC, "s|Z", &arg1, &arg1_len, &info) == FAILURE) { + return; + } + + if (argc == 2) { zval_dtor(*info); - array_init(*info); - - convert_to_string_ex(arg1); - break; - - default: - RETVAL_FALSE; - WRONG_PARAM_COUNT; } - stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb", STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL); + stream = php_stream_open_wrapper(arg1, "rb", STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL); if (!stream) { RETURN_FALSE; @@ -1342,7 +1322,7 @@ itype = php_getimagetype(stream, NULL TSRMLS_CC); switch( itype) { case IMAGE_FILETYPE_GIF: - result = php_handle_gif (stream TSRMLS_CC); + result = php_handle_gif(stream TSRMLS_CC); break; case IMAGE_FILETYPE_JPEG: if (info) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.6&r2=1.249.2.10.2.14.2.7&diff_format=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.6 php-src/ext/standard/info.c:1.249.2.10.2.14.2.7 --- php-src/ext/standard/info.c:1.249.2.10.2.14.2.6 Tue May 27 18:25:59 2008 +++ php-src/ext/standard/info.c Fri Jun 20 14:53:57 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.249.2.10.2.14.2.6 2008/05/27 18:25:59 pajoye Exp $ */ +/* $Id: info.c,v 1.249.2.10.2.14.2.7 2008/06/20 14:53:57 felipe Exp $ */ #include "php.h" #include "php_ini.h" @@ -1033,20 +1033,23 @@ PHP_FUNCTION(phpversion) { zval **arg; + const char *version; int argc = ZEND_NUM_ARGS(); if (argc == 0) { RETURN_STRING(PHP_VERSION, 1); - } else if (argc == 1 && zend_get_parameters_ex(1, &arg) == SUCCESS) { - const char *version; + } else { + if (zend_parse_parameters(argc TSRMLS_CC, "Z", &arg) == FAILURE) { + return; + } + convert_to_string_ex(arg); version = zend_get_module_version(Z_STRVAL_PP(arg)); + if (version == NULL) { RETURN_FALSE; } RETURN_STRING(version, 1); - } else { - WRONG_PARAM_COUNT; } } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/pack.c?r1=1.57.2.5.2.6.2.1&r2=1.57.2.5.2.6.2.2&diff_format=u Index: php-src/ext/standard/pack.c diff -u php-src/ext/standard/pack.c:1.57.2.5.2.6.2.1 php-src/ext/standard/pack.c:1.57.2.5.2.6.2.2 --- php-src/ext/standard/pack.c:1.57.2.5.2.6.2.1 Mon Dec 31 07:17:15 2007 +++ php-src/ext/standard/pack.c Fri Jun 20 14:53:57 2008 @@ -15,7 +15,7 @@ | Author: Chris Schneider <cschneid@relog.ch> | +----------------------------------------------------------------------+ */ -/* $Id: pack.c,v 1.57.2.5.2.6.2.1 2007/12/31 07:17:15 sebastian Exp $ */ +/* $Id: pack.c,v 1.57.2.5.2.6.2.2 2008/06/20 14:53:57 felipe Exp $ */ #include "php.h" @@ -514,26 +514,19 @@ Unpack binary string into named array elements according to format argument */ PHP_FUNCTION(unpack) { - zval **formatarg; - zval **inputarg; - char *format; - char *input; - int formatlen; - int inputpos, inputlen; - int i; - - if (ZEND_NUM_ARGS() != 2 || - zend_get_parameters_ex(2, &formatarg, &inputarg) == FAILURE) { - WRONG_PARAM_COUNT; + char *format, *input, *formatarg, *inputarg; + int formatlen, formatarg_len, inputarg_len; + int inputpos, inputlen, i; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &formatarg, &formatarg_len, + &inputarg, &inputarg_len) == FAILURE) { + return; } - convert_to_string_ex(formatarg); - convert_to_string_ex(inputarg); - - format = Z_STRVAL_PP(formatarg); - formatlen = Z_STRLEN_PP(formatarg); - input = Z_STRVAL_PP(inputarg); - inputlen = Z_STRLEN_PP(inputarg); + format = formatarg; + formatlen = formatarg_len; + input = inputarg; + inputlen = inputarg_len; inputpos = 0; array_init(return_value); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/quot_print.c?r1=1.29.2.2.2.1.2.1&r2=1.29.2.2.2.1.2.2&diff_format=u Index: php-src/ext/standard/quot_print.c diff -u php-src/ext/standard/quot_print.c:1.29.2.2.2.1.2.1 php-src/ext/standard/quot_print.c:1.29.2.2.2.1.2.2 --- php-src/ext/standard/quot_print.c:1.29.2.2.2.1.2.1 Mon Dec 31 07:17:15 2007 +++ php-src/ext/standard/quot_print.c Fri Jun 20 14:53:57 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: quot_print.c,v 1.29.2.2.2.1.2.1 2007/12/31 07:17:15 sebastian Exp $ */ +/* $Id: quot_print.c,v 1.29.2.2.2.1.2.2 2008/06/20 14:53:57 felipe Exp $ */ #include <stdlib.h> @@ -151,22 +151,20 @@ Convert a quoted-printable string to an 8 bit string */ PHP_FUNCTION(quoted_printable_decode) { - zval **arg1; - char *str_in, *str_out; - int i = 0, j = 0, k; + char *arg1, *str_in, *str_out; + int arg1_len, i = 0, j = 0, k; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg1, &arg1_len) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string_ex(arg1); - if (Z_STRLEN_PP(arg1) == 0) { + if (arg1_len == 0) { /* shortcut */ RETURN_EMPTY_STRING(); } - str_in = Z_STRVAL_PP(arg1); - str_out = emalloc(Z_STRLEN_PP(arg1) + 1); + str_in = arg1; + str_out = emalloc(arg1_len + 1); while (str_in[i]) { switch (str_in[i]) { case '=': http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.14&r2=1.58.2.6.2.15.2.15&diff_format=u Index: php-src/ext/standard/streamsfuncs.c diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.14 php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.15 --- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.14 Sun May 4 21:17:33 2008 +++ php-src/ext/standard/streamsfuncs.c Fri Jun 20 14:53:57 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.14 2008/05/04 21:17:33 colder Exp $ */ +/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.15 2008/06/20 14:53:57 felipe Exp $ */ #include "php.h" #include "php_globals.h" @@ -454,14 +454,14 @@ Retrieves header/meta data from streams/file pointers */ PHP_FUNCTION(stream_get_meta_data) { - zval **arg1; + zval *arg1; php_stream *stream; zval *newval; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) == FAILURE) { + return; } - php_stream_from_zval(stream, arg1); + php_stream_from_zval(stream, &arg1); array_init(return_value); @@ -1219,52 +1219,53 @@ Set blocking/non-blocking mode on a socket or stream */ PHP_FUNCTION(stream_set_blocking) { - zval **arg1, **arg2; + zval *arg1; int block; + long arg2; php_stream *stream; - if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &arg1, &arg2) == FAILURE) { + return; } - php_stream_from_zval(stream, arg1); + php_stream_from_zval(stream, &arg1); - convert_to_long_ex(arg2); - block = Z_LVAL_PP(arg2); + block = arg2; - if (php_stream_set_option(stream, PHP_STREAM_OPTION_BLOCKING, block == 0 ? 0 : 1, NULL) == -1) + if (php_stream_set_option(stream, PHP_STREAM_OPTION_BLOCKING, block == 0 ? 0 : 1, NULL) == -1) { RETURN_FALSE; + } + RETURN_TRUE; } /* }}} */ -/* {{{ proto bool stream_set_timeout(resource stream, int seconds, int microseconds) +/* {{{ proto bool stream_set_timeout(resource stream, int seconds [, int microseconds]) Set timeout on stream read to seconds + microseonds */ #if HAVE_SYS_TIME_H || defined(PHP_WIN32) PHP_FUNCTION(stream_set_timeout) { - zval **socket, **seconds, **microseconds; + zval *socket; + long seconds, microseconds; struct timeval t; php_stream *stream; + int argc = ZEND_NUM_ARGS(); - if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 3 || - zend_get_parameters_ex(ZEND_NUM_ARGS(), &socket, &seconds, µseconds)==FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(argc TSRMLS_CC, "rl|l", &socket, &seconds, µseconds) == FAILURE) { + return; } - php_stream_from_zval(stream, socket); + php_stream_from_zval(stream, &socket); - convert_to_long_ex(seconds); - t.tv_sec = Z_LVAL_PP(seconds); + t.tv_sec = seconds; - if (ZEND_NUM_ARGS() == 3) { - convert_to_long_ex(microseconds); - t.tv_usec = Z_LVAL_PP(microseconds) % 1000000; - t.tv_sec += Z_LVAL_PP(microseconds) / 1000000; - } - else + if (argc == 3) { + t.tv_usec = microseconds % 1000000; + t.tv_sec += microseconds / 1000000; + } else { t.tv_usec = 0; + } if (PHP_STREAM_OPTION_RETURN_OK == php_stream_set_option(stream, PHP_STREAM_OPTION_READ_TIMEOUT, 0, &t)) { RETURN_TRUE; @@ -1279,14 +1280,15 @@ Set file write buffer */ PHP_FUNCTION(stream_set_write_buffer) { - zval **arg1, **arg2; + zval *arg1; int ret; + long arg2; size_t buff; php_stream *stream; switch (ZEND_NUM_ARGS()) { case 2: - if (zend_get_parameters_ex(2, &arg1, &arg2)==FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &arg1, &arg2) == FAILURE) { RETURN_FALSE; } break; @@ -1296,10 +1298,9 @@ break; } - php_stream_from_zval(stream, arg1); - - convert_to_long_ex(arg2); - buff = Z_LVAL_PP(arg2); + php_stream_from_zval(stream, &arg1); + + buff = arg2; /* if buff is 0 then set to non-buffered */ if (buff == 0) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.203.2.7.2.18.2.7&r2=1.203.2.7.2.18.2.8&diff_format=u Index: php-src/ext/standard/var.c diff -u php-src/ext/standard/var.c:1.203.2.7.2.18.2.7 php-src/ext/standard/var.c:1.203.2.7.2.18.2.8 --- php-src/ext/standard/var.c:1.203.2.7.2.18.2.7 Mon Dec 31 07:17:15 2007 +++ php-src/ext/standard/var.c Fri Jun 20 14:53:57 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.203.2.7.2.18.2.7 2007/12/31 07:17:15 sebastian Exp $ */ +/* $Id: var.c,v 1.203.2.7.2.18.2.8 2008/06/20 14:53:57 felipe Exp $ */ /* {{{ includes */ @@ -838,8 +838,8 @@ php_serialize_data_t var_hash; smart_str buf = {0}; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &struc) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &struc) == FAILURE) { + return; } Z_TYPE_P(return_value) = IS_STRING; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/stream_rfc2397_002.phpt?r1=1.2.2.3.2.1&r2=1.2.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/stream_rfc2397_002.phpt diff -u php-src/ext/standard/tests/file/stream_rfc2397_002.phpt:1.2.2.3.2.1 php-src/ext/standard/tests/file/stream_rfc2397_002.phpt:1.2.2.3.2.2 --- php-src/ext/standard/tests/file/stream_rfc2397_002.phpt:1.2.2.3.2.1 Sat Mar 8 19:12:34 2008 +++ php-src/ext/standard/tests/file/stream_rfc2397_002.phpt Fri Jun 20 14:53:57 2008 @@ -52,7 +52,7 @@ NULL Warning: fopen(data://): failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL array(7) { ["wrapper_type"]=> @@ -73,15 +73,15 @@ NULL Warning: fopen(data://;base64): failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL Warning: fopen(data://foo,): failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL Warning: fopen(data://foo=bar,): failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL array(8) { ["wrapper_type"]=> @@ -104,7 +104,7 @@ NULL Warning: fopen(data://text/plain;foo,): failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL array(9) { ["wrapper_type"]=> @@ -129,7 +129,7 @@ string(3) "bar" Warning: fopen(data://text/plain;foo=bar;bla,): failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL array(9) { ["wrapper_type"]=> @@ -154,7 +154,7 @@ string(3) "bar" Warning: fopen(data://text/plain;foo=bar;bar=baz): failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL array(10) { ["wrapper_type"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/floatval.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/general_functions/floatval.phpt diff -u php-src/ext/standard/tests/general_functions/floatval.phpt:1.1.2.1 php-src/ext/standard/tests/general_functions/floatval.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/general_functions/floatval.phpt:1.1.2.1 Tue Jun 5 09:12:34 2007 +++ php-src/ext/standard/tests/general_functions/floatval.phpt Fri Jun 20 14:53:57 2008 @@ -192,16 +192,16 @@ *** Testing error conditions *** -Warning: Wrong parameter count for floatval() in %s on line %d +Warning: floatval() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for doubleval() in %s on line %d +Warning: doubleval() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for floatval() in %s on line %d +Warning: floatval() expects exactly 1 parameter, 2 given in %s on line %d NULL -Warning: Wrong parameter count for doubleval() in %s on line %d +Warning: doubleval() expects exactly 1 parameter, 2 given in %s on line %d NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt diff -u php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt:1.1.2.1 php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt:1.1.2.1 Tue May 22 16:01:59 2007 +++ php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt Fri Jun 20 14:53:57 2008 @@ -37,18 +37,18 @@ *** Testing gettype(): error conditions *** -Warning: Wrong parameter count for gettype() in %s on line %d +Warning: gettype() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for gettype() in %s on line %d +Warning: gettype() expects exactly 1 parameter, 2 given in %s on line %d NULL *** Testing settype(): error conditions *** -Warning: Wrong parameter count for settype() in %s on line %d +Warning: settype() expects exactly 2 parameters, 0 given in %s on line %d NULL -Warning: Wrong parameter count for settype() in %s on line %d +Warning: settype() expects exactly 2 parameters, 3 given in %s on line %d NULL Warning: settype(): Invalid type in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/strval.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/general_functions/strval.phpt diff -u php-src/ext/standard/tests/general_functions/strval.phpt:1.1.2.2 php-src/ext/standard/tests/general_functions/strval.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/general_functions/strval.phpt:1.1.2.2 Mon May 14 11:04:08 2007 +++ php-src/ext/standard/tests/general_functions/strval.phpt Fri Jun 20 14:53:57 2008 @@ -302,9 +302,9 @@ *** Testing error conditions *** -Warning: Wrong parameter count for strval() in %s on line %d +Warning: strval() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for strval() in %s on line %d +Warning: strval() expects exactly 1 parameter, 2 given in %s on line %d NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_error_001.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_error_001.phpt diff -u php-src/ext/standard/tests/serialize/serialization_error_001.phpt:1.1.4.2 php-src/ext/standard/tests/serialize/serialization_error_001.phpt:1.1.4.3 --- php-src/ext/standard/tests/serialize/serialization_error_001.phpt:1.1.4.2 Tue Mar 18 15:11:48 2008 +++ php-src/ext/standard/tests/serialize/serialization_error_001.phpt Fri Jun 20 14:53:57 2008 @@ -28,15 +28,15 @@ --EXPECTF-- *** Testing serialize()/unserialize() : error conditions *** -Warning: Wrong parameter count for serialize() in %s on line 16 +Warning: serialize() expects exactly 1 parameter, 0 given in %s on line 16 NULL Warning: unserialize() expects exactly 1 parameter, 0 given in %s on line 17 bool(false) -Warning: Wrong parameter count for serialize() in %s on line 20 +Warning: serialize() expects exactly 1 parameter, 2 given in %s on line 20 NULL Warning: unserialize() expects exactly 1 parameter, 2 given in %s on line 21 bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt diff -u php-src/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt:1.1.2.2 php-src/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt:1.1.2.3 --- php-src/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt:1.1.2.2 Wed Mar 19 17:38:23 2008 +++ php-src/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt Fri Jun 20 14:53:57 2008 @@ -37,18 +37,18 @@ -- Testing stream_get_meta_data() function with Zero arguments -- -Warning: Wrong parameter count for stream_get_meta_data() in %s on line %i +Warning: stream_get_meta_data() expects exactly 1 parameter, 0 given in %s on line %i NULL -- Testing stream_get_meta_data() function with more than expected no. of arguments -- -Warning: Wrong parameter count for stream_get_meta_data() in %s on line %i +Warning: stream_get_meta_data() expects exactly 1 parameter, 2 given in %s on line %i NULL -- Testing stream_get_meta_data() function with invalid stream resource -- -Warning: stream_get_meta_data(): supplied argument is not a valid stream resource in %s on line %i -bool(false) +Warning: stream_get_meta_data() expects parameter 1 to be resource, null given in %s on line %i +NULL -- Testing stream_get_meta_data() function with closed stream resource -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_set_timeout_error.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/streams/stream_set_timeout_error.phpt diff -u php-src/ext/standard/tests/streams/stream_set_timeout_error.phpt:1.1.2.2 php-src/ext/standard/tests/streams/stream_set_timeout_error.phpt:1.1.2.3 --- php-src/ext/standard/tests/streams/stream_set_timeout_error.phpt:1.1.2.2 Wed Mar 19 17:38:23 2008 +++ php-src/ext/standard/tests/streams/stream_set_timeout_error.phpt Fri Jun 20 14:53:57 2008 @@ -56,12 +56,12 @@ -- Testing stream_set_timeout() function with more than expected no. of arguments -- -Warning: Wrong parameter count for stream_set_timeout() in %s on line %i +Warning: stream_set_timeout() expects at most 3 parameters, 4 given in %s on line %i NULL -- Testing stream_set_timeout() function with less than expected no. of arguments -- -Warning: Wrong parameter count for stream_set_timeout() in %s on line %i +Warning: stream_set_timeout() expects at least 2 parameters, 1 given in %s on line %i NULL -- Testing stream_set_timeout() function with a closed socket -- @@ -71,8 +71,8 @@ -- Testing stream_set_timeout() function with an invalid stream -- -Warning: stream_set_timeout(): supplied argument is not a valid stream resource in %s on line %i -bool(false) +Warning: stream_set_timeout() expects parameter 1 to be resource, integer given in %s on line %i +NULL -- Testing stream_set_timeout() function with a stream that does not support timeouts -- bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftok.c?r1=1.16.2.1.2.1.2.1&r2=1.16.2.1.2.1.2.2&diff_format=u Index: php-src/ext/standard/ftok.c diff -u php-src/ext/standard/ftok.c:1.16.2.1.2.1.2.1 php-src/ext/standard/ftok.c:1.16.2.1.2.1.2.2 --- php-src/ext/standard/ftok.c:1.16.2.1.2.1.2.1 Mon Dec 31 07:17:15 2007 +++ php-src/ext/standard/ftok.c Fri Jun 20 14:53:57 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ftok.c,v 1.16.2.1.2.1.2.1 2007/12/31 07:17:15 sebastian Exp $ */ +/* $Id: ftok.c,v 1.16.2.1.2.1.2.2 2008/06/20 14:53:57 felipe Exp $ */ #include "php.h" @@ -31,31 +31,29 @@ Convert a pathname and a project identifier to a System V IPC key */ PHP_FUNCTION(ftok) { - zval **pathname, **proj; + char *pathname, *proj; + int pathname_len, proj_len; key_t k; - if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pathname, &proj) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, &pathname, &pathname_len, &proj, &proj_len) == FAILURE) { + return; } - convert_to_string_ex(pathname); - convert_to_string_ex(proj); - - if (Z_STRLEN_PP(pathname)==0){ + if (pathname_len == 0){ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Pathname is invalid"); RETURN_LONG(-1); } - if (Z_STRLEN_PP(proj)!=1){ + if (proj_len != 1){ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Project identifier is invalid"); RETURN_LONG(-1); } - if ((PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(pathname), NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(Z_STRVAL_PP(pathname) TSRMLS_CC)) { + if ((PG(safe_mode) && (!php_checkuid(pathname, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(pathname TSRMLS_CC)) { RETURN_LONG(-1); } - k = ftok(Z_STRVAL_PP(pathname),Z_STRVAL_PP(proj)[0]); + k = ftok(pathname, proj[0]); if (k == -1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "ftok() failed - %s", strerror(errno)); } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/image.c?r1=1.114.2.2.2.5.2.4&r2=1.114.2.2.2.5.2.5&diff_format=u Index: php-src/ext/standard/image.c diff -u php-src/ext/standard/image.c:1.114.2.2.2.5.2.4 php-src/ext/standard/image.c:1.114.2.2.2.5.2.5 --- php-src/ext/standard/image.c:1.114.2.2.2.5.2.4 Sat May 24 11:53:55 2008 +++ php-src/ext/standard/image.c Fri Jun 20 14:53:57 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.114.2.2.2.5.2.4 2008/05/24 11:53:55 helly Exp $ */ +/* $Id: image.c,v 1.114.2.2.2.5.2.5 2008/06/20 14:53:57 felipe Exp $ */ #include "php.h" #include <stdio.h> @@ -1160,15 +1160,13 @@ Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype */ PHP_FUNCTION(image_type_to_mime_type) { - zval **p_image_type; - int arg_c = ZEND_NUM_ARGS(); + long p_image_type; - if ((arg_c!=1) || zend_get_parameters_ex(arg_c, &p_image_type) == FAILURE) { - RETVAL_FALSE; - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &p_image_type) == FAILURE) { + return; } - convert_to_long_ex(p_image_type); - ZVAL_STRING(return_value, (char*)php_image_type_to_mime_type(Z_LVAL_PP(p_image_type)), 1); + + ZVAL_STRING(return_value, (char*)php_image_type_to_mime_type(p_image_type), 1); } /* }}} */ @@ -1300,40 +1298,22 @@ Get the size of an image as 4-element array */ PHP_FUNCTION(getimagesize) { - zval **arg1, **info = NULL; - int itype = 0; - char *temp; + zval **info = NULL; + char *arg1, *temp; + int arg1_len, itype = 0, argc = ZEND_NUM_ARGS(); struct gfxinfo *result = NULL; php_stream * stream = NULL; - switch(ZEND_NUM_ARGS()) { - - case 1: - if (zend_get_parameters_ex(1, &arg1) == FAILURE) { - RETVAL_FALSE; - WRONG_PARAM_COUNT; - } - convert_to_string_ex(arg1); - break; - - case 2: - if (zend_get_parameters_ex(2, &arg1, &info) == FAILURE) { - RETVAL_FALSE; - WRONG_PARAM_COUNT; - } + if (zend_parse_parameters(argc TSRMLS_CC, "s|Z", &arg1, &arg1_len, &info) == FAILURE) { + return; + } + + if (argc == 2) { zval_dtor(*info); - array_init(*info); - - convert_to_string_ex(arg1); - break; - - default: - RETVAL_FALSE; - WRONG_PARAM_COUNT; } - stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb", STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL); + stream = php_stream_open_wrapper(arg1, "rb", STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL); if (!stream) { RETURN_FALSE; @@ -1342,7 +1322,7 @@ itype = php_getimagetype(stream, NULL TSRMLS_CC); switch( itype) { case IMAGE_FILETYPE_GIF: - result = php_handle_gif (stream TSRMLS_CC); + result = php_handle_gif(stream TSRMLS_CC); break; case IMAGE_FILETYPE_JPEG: if (info) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.6&r2=1.249.2.10.2.14.2.7&diff_format=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.6 php-src/ext/standard/info.c:1.249.2.10.2.14.2.7 --- php-src/ext/standard/info.c:1.249.2.10.2.14.2.6 Tue May 27 18:25:59 2008 +++ php-src/ext/standard/info.c Fri Jun 20 14:53:57 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.249.2.10.2.14.2.6 2008/05/27 18:25:59 pajoye Exp $ */ +/* $Id: info.c,v 1.249.2.10.2.14.2.7 2008/06/20 14:53:57 felipe Exp $ */ #include "php.h" #include "php_ini.h" @@ -1033,20 +1033,23 @@ PHP_FUNCTION(phpversion) { zval **arg; + const char *version; int argc = ZEND_NUM_ARGS(); if (argc == 0) { RETURN_STRING(PHP_VERSION, 1); - } else if (argc == 1 && zend_get_parameters_ex(1, &arg) == SUCCESS) { - const char *version; + } else { + if (zend_parse_parameters(argc TSRMLS_CC, "Z", &arg) == FAILURE) { + return; + } + convert_to_string_ex(arg); version = zend_get_module_version(Z_STRVAL_PP(arg)); + if (version == NULL) { RETURN_FALSE; } RETURN_STRING(version, 1); - } else { - WRONG_PARAM_COUNT; } } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/pack.c?r1=1.57.2.5.2.6.2.1&r2=1.57.2.5.2.6.2.2&diff_format=u Index: php-src/ext/standard/pack.c diff -u php-src/ext/standard/pack.c:1.57.2.5.2.6.2.1 php-src/ext/standard/pack.c:1.57.2.5.2.6.2.2 --- php-src/ext/standard/pack.c:1.57.2.5.2.6.2.1 Mon Dec 31 07:17:15 2007 +++ php-src/ext/standard/pack.c Fri Jun 20 14:53:57 2008 @@ -15,7 +15,7 @@ | Author: Chris Schneider <cschneid@relog.ch> | +----------------------------------------------------------------------+ */ -/* $Id: pack.c,v 1.57.2.5.2.6.2.1 2007/12/31 07:17:15 sebastian Exp $ */ +/* $Id: pack.c,v 1.57.2.5.2.6.2.2 2008/06/20 14:53:57 felipe Exp $ */ #include "php.h" @@ -514,26 +514,19 @@ Unpack binary string into named array elements according to format argument */ PHP_FUNCTION(unpack) { - zval **formatarg; - zval **inputarg; - char *format; - char *input; - int formatlen; - int inputpos, inputlen; - int i; - - if (ZEND_NUM_ARGS() != 2 || - zend_get_parameters_ex(2, &formatarg, &inputarg) == FAILURE) { - WRONG_PARAM_COUNT; + char *format, *input, *formatarg, *inputarg; + int formatlen, formatarg_len, inputarg_len; + int inputpos, inputlen, i; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &formatarg, &formatarg_len, + &inputarg, &inputarg_len) == FAILURE) { + return; } - convert_to_string_ex(formatarg); - convert_to_string_ex(inputarg); - - format = Z_STRVAL_PP(formatarg); - formatlen = Z_STRLEN_PP(formatarg); - input = Z_STRVAL_PP(inputarg); - inputlen = Z_STRLEN_PP(inputarg); + format = formatarg; + formatlen = formatarg_len; + input = inputarg; + inputlen = inputarg_len; inputpos = 0; array_init(return_value); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/quot_print.c?r1=1.29.2.2.2.1.2.1&r2=1.29.2.2.2.1.2.2&diff_format=u Index: php-src/ext/standard/quot_print.c diff -u php-src/ext/standard/quot_print.c:1.29.2.2.2.1.2.1 php-src/ext/standard/quot_print.c:1.29.2.2.2.1.2.2 --- php-src/ext/standard/quot_print.c:1.29.2.2.2.1.2.1 Mon Dec 31 07:17:15 2007 +++ php-src/ext/standard/quot_print.c Fri Jun 20 14:53:57 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: quot_print.c,v 1.29.2.2.2.1.2.1 2007/12/31 07:17:15 sebastian Exp $ */ +/* $Id: quot_print.c,v 1.29.2.2.2.1.2.2 2008/06/20 14:53:57 felipe Exp $ */ #include <stdlib.h> @@ -151,22 +151,20 @@ Convert a quoted-printable string to an 8 bit string */ PHP_FUNCTION(quoted_printable_decode) { - zval **arg1; - char *str_in, *str_out; - int i = 0, j = 0, k; + char *arg1, *str_in, *str_out; + int arg1_len, i = 0, j = 0, k; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg1, &arg1_len) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string_ex(arg1); - if (Z_STRLEN_PP(arg1) == 0) { + if (arg1_len == 0) { /* shortcut */ RETURN_EMPTY_STRING(); } - str_in = Z_STRVAL_PP(arg1); - str_out = emalloc(Z_STRLEN_PP(arg1) + 1); + str_in = arg1; + str_out = emalloc(arg1_len + 1); while (str_in[i]) { switch (str_in[i]) { case '=': http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.14&r2=1.58.2.6.2.15.2.15&diff_format=u Index: php-src/ext/standard/streamsfuncs.c diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.14 php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.15 --- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.14 Sun May 4 21:17:33 2008 +++ php-src/ext/standard/streamsfuncs.c Fri Jun 20 14:53:57 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.14 2008/05/04 21:17:33 colder Exp $ */ +/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.15 2008/06/20 14:53:57 felipe Exp $ */ #include "php.h" #include "php_globals.h" @@ -454,14 +454,14 @@ Retrieves header/meta data from streams/file pointers */ PHP_FUNCTION(stream_get_meta_data) { - zval **arg1; + zval *arg1; php_stream *stream; zval *newval; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) == FAILURE) { + return; } - php_stream_from_zval(stream, arg1); + php_stream_from_zval(stream, &arg1); array_init(return_value); @@ -1219,52 +1219,53 @@ Set blocking/non-blocking mode on a socket or stream */ PHP_FUNCTION(stream_set_blocking) { - zval **arg1, **arg2; + zval *arg1; int block; + long arg2; php_stream *stream; - if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &arg1, &arg2) == FAILURE) { + return; } - php_stream_from_zval(stream, arg1); + php_stream_from_zval(stream, &arg1); - convert_to_long_ex(arg2); - block = Z_LVAL_PP(arg2); + block = arg2; - if (php_stream_set_option(stream, PHP_STREAM_OPTION_BLOCKING, block == 0 ? 0 : 1, NULL) == -1) + if (php_stream_set_option(stream, PHP_STREAM_OPTION_BLOCKING, block == 0 ? 0 : 1, NULL) == -1) { RETURN_FALSE; + } + RETURN_TRUE; } /* }}} */ -/* {{{ proto bool stream_set_timeout(resource stream, int seconds, int microseconds) +/* {{{ proto bool stream_set_timeout(resource stream, int seconds [, int microseconds]) Set timeout on stream read to seconds + microseonds */ #if HAVE_SYS_TIME_H || defined(PHP_WIN32) PHP_FUNCTION(stream_set_timeout) { - zval **socket, **seconds, **microseconds; + zval *socket; + long seconds, microseconds; struct timeval t; php_stream *stream; + int argc = ZEND_NUM_ARGS(); - if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 3 || - zend_get_parameters_ex(ZEND_NUM_ARGS(), &socket, &seconds, µseconds)==FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(argc TSRMLS_CC, "rl|l", &socket, &seconds, µseconds) == FAILURE) { + return; } - php_stream_from_zval(stream, socket); + php_stream_from_zval(stream, &socket); - convert_to_long_ex(seconds); - t.tv_sec = Z_LVAL_PP(seconds); + t.tv_sec = seconds; - if (ZEND_NUM_ARGS() == 3) { - convert_to_long_ex(microseconds); - t.tv_usec = Z_LVAL_PP(microseconds) % 1000000; - t.tv_sec += Z_LVAL_PP(microseconds) / 1000000; - } - else + if (argc == 3) { + t.tv_usec = microseconds % 1000000; + t.tv_sec += microseconds / 1000000; + } else { t.tv_usec = 0; + } if (PHP_STREAM_OPTION_RETURN_OK == php_stream_set_option(stream, PHP_STREAM_OPTION_READ_TIMEOUT, 0, &t)) { RETURN_TRUE; @@ -1279,14 +1280,15 @@ Set file write buffer */ PHP_FUNCTION(stream_set_write_buffer) { - zval **arg1, **arg2; + zval *arg1; int ret; + long arg2; size_t buff; php_stream *stream; switch (ZEND_NUM_ARGS()) { case 2: - if (zend_get_parameters_ex(2, &arg1, &arg2)==FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &arg1, &arg2) == FAILURE) { RETURN_FALSE; } break; @@ -1296,10 +1298,9 @@ break; } - php_stream_from_zval(stream, arg1); - - convert_to_long_ex(arg2); - buff = Z_LVAL_PP(arg2); + php_stream_from_zval(stream, &arg1); + + buff = arg2; /* if buff is 0 then set to non-buffered */ if (buff == 0) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.203.2.7.2.18.2.7&r2=1.203.2.7.2.18.2.8&diff_format=u Index: php-src/ext/standard/var.c diff -u php-src/ext/standard/var.c:1.203.2.7.2.18.2.7 php-src/ext/standard/var.c:1.203.2.7.2.18.2.8 --- php-src/ext/standard/var.c:1.203.2.7.2.18.2.7 Mon Dec 31 07:17:15 2007 +++ php-src/ext/standard/var.c Fri Jun 20 14:53:57 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.203.2.7.2.18.2.7 2007/12/31 07:17:15 sebastian Exp $ */ +/* $Id: var.c,v 1.203.2.7.2.18.2.8 2008/06/20 14:53:57 felipe Exp $ */ /* {{{ includes */ @@ -838,8 +838,8 @@ php_serialize_data_t var_hash; smart_str buf = {0}; - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &struc) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &struc) == FAILURE) { + return; } Z_TYPE_P(return_value) = IS_STRING; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/stream_rfc2397_002.phpt?r1=1.2.2.3.2.1&r2=1.2.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/file/stream_rfc2397_002.phpt diff -u php-src/ext/standard/tests/file/stream_rfc2397_002.phpt:1.2.2.3.2.1 php-src/ext/standard/tests/file/stream_rfc2397_002.phpt:1.2.2.3.2.2 --- php-src/ext/standard/tests/file/stream_rfc2397_002.phpt:1.2.2.3.2.1 Sat Mar 8 19:12:34 2008 +++ php-src/ext/standard/tests/file/stream_rfc2397_002.phpt Fri Jun 20 14:53:57 2008 @@ -52,7 +52,7 @@ NULL Warning: fopen(data://): failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL array(7) { ["wrapper_type"]=> @@ -73,15 +73,15 @@ NULL Warning: fopen(data://;base64): failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL Warning: fopen(data://foo,): failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL Warning: fopen(data://foo=bar,): failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL array(8) { ["wrapper_type"]=> @@ -104,7 +104,7 @@ NULL Warning: fopen(data://text/plain;foo,): failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL array(9) { ["wrapper_type"]=> @@ -129,7 +129,7 @@ string(3) "bar" Warning: fopen(data://text/plain;foo=bar;bla,): failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL array(9) { ["wrapper_type"]=> @@ -154,7 +154,7 @@ string(3) "bar" Warning: fopen(data://text/plain;foo=bar;bar=baz): failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL array(10) { ["wrapper_type"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/floatval.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/general_functions/floatval.phpt diff -u php-src/ext/standard/tests/general_functions/floatval.phpt:1.1.2.1 php-src/ext/standard/tests/general_functions/floatval.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/general_functions/floatval.phpt:1.1.2.1 Tue Jun 5 09:12:34 2007 +++ php-src/ext/standard/tests/general_functions/floatval.phpt Fri Jun 20 14:53:57 2008 @@ -192,16 +192,16 @@ *** Testing error conditions *** -Warning: Wrong parameter count for floatval() in %s on line %d +Warning: floatval() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for doubleval() in %s on line %d +Warning: doubleval() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for floatval() in %s on line %d +Warning: floatval() expects exactly 1 parameter, 2 given in %s on line %d NULL -Warning: Wrong parameter count for doubleval() in %s on line %d +Warning: doubleval() expects exactly 1 parameter, 2 given in %s on line %d NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u Index: php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt diff -u php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt:1.1.2.1 php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt:1.1.2.1 Tue May 22 16:01:59 2007 +++ php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt Fri Jun 20 14:53:57 2008 @@ -37,18 +37,18 @@ *** Testing gettype(): error conditions *** -Warning: Wrong parameter count for gettype() in %s on line %d +Warning: gettype() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for gettype() in %s on line %d +Warning: gettype() expects exactly 1 parameter, 2 given in %s on line %d NULL *** Testing settype(): error conditions *** -Warning: Wrong parameter count for settype() in %s on line %d +Warning: settype() expects exactly 2 parameters, 0 given in %s on line %d NULL -Warning: Wrong parameter count for settype() in %s on line %d +Warning: settype() expects exactly 2 parameters, 3 given in %s on line %d NULL Warning: settype(): Invalid type in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/strval.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/general_functions/strval.phpt diff -u php-src/ext/standard/tests/general_functions/strval.phpt:1.1.2.2 php-src/ext/standard/tests/general_functions/strval.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/general_functions/strval.phpt:1.1.2.2 Mon May 14 11:04:08 2007 +++ php-src/ext/standard/tests/general_functions/strval.phpt Fri Jun 20 14:53:57 2008 @@ -302,9 +302,9 @@ *** Testing error conditions *** -Warning: Wrong parameter count for strval() in %s on line %d +Warning: strval() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for strval() in %s on line %d +Warning: strval() expects exactly 1 parameter, 2 given in %s on line %d NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/serialization_error_001.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/serialize/serialization_error_001.phpt diff -u php-src/ext/standard/tests/serialize/serialization_error_001.phpt:1.1.4.2 php-src/ext/standard/tests/serialize/serialization_error_001.phpt:1.1.4.3 --- php-src/ext/standard/tests/serialize/serialization_error_001.phpt:1.1.4.2 Tue Mar 18 15:11:48 2008 +++ php-src/ext/standard/tests/serialize/serialization_error_001.phpt Fri Jun 20 14:53:57 2008 @@ -28,15 +28,15 @@ --EXPECTF-- *** Testing serialize()/unserialize() : error conditions *** -Warning: Wrong parameter count for serialize() in %s on line 16 +Warning: serialize() expects exactly 1 parameter, 0 given in %s on line 16 NULL Warning: unserialize() expects exactly 1 parameter, 0 given in %s on line 17 bool(false) -Warning: Wrong parameter count for serialize() in %s on line 20 +Warning: serialize() expects exactly 1 parameter, 2 given in %s on line 20 NULL Warning: unserialize() expects exactly 1 parameter, 2 given in %s on line 21 bool(false) -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt diff -u php-src/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt:1.1.2.2 php-src/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt:1.1.2.3 --- php-src/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt:1.1.2.2 Wed Mar 19 17:38:23 2008 +++ php-src/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt Fri Jun 20 14:53:57 2008 @@ -37,18 +37,18 @@ -- Testing stream_get_meta_data() function with Zero arguments -- -Warning: Wrong parameter count for stream_get_meta_data() in %s on line %i +Warning: stream_get_meta_data() expects exactly 1 parameter, 0 given in %s on line %i NULL -- Testing stream_get_meta_data() function with more than expected no. of arguments -- -Warning: Wrong parameter count for stream_get_meta_data() in %s on line %i +Warning: stream_get_meta_data() expects exactly 1 parameter, 2 given in %s on line %i NULL -- Testing stream_get_meta_data() function with invalid stream resource -- -Warning: stream_get_meta_data(): supplied argument is not a valid stream resource in %s on line %i -bool(false) +Warning: stream_get_meta_data() expects parameter 1 to be resource, null given in %s on line %i +NULL -- Testing stream_get_meta_data() function with closed stream resource -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_set_timeout_error.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/streams/stream_set_timeout_error.phpt diff -u php-src/ext/standard/tests/streams/stream_set_timeout_error.phpt:1.1.2.2 php-src/ext/standard/tests/streams/stream_set_timeout_error.phpt:1.1.2.3 --- php-src/ext/standard/tests/streams/stream_set_timeout_error.phpt:1.1.2.2 Wed Mar 19 17:38:23 2008 +++ php-src/ext/standard/tests/streams/stream_set_timeout_error.phpt Fri Jun 20 14:53:57 2008 @@ -56,12 +56,12 @@ -- Testing stream_set_timeout() function with more than expected no. of arguments -- -Warning: Wrong parameter count for stream_set_timeout() in %s on line %i +Warning: stream_set_timeout() expects at most 3 parameters, 4 given in %s on line %i NULL -- Testing stream_set_timeout() function with less than expected no. of arguments -- -Warning: Wrong parameter count for stream_set_timeout() in %s on line %i +Warning: stream_set_timeout() expects at least 2 parameters, 1 given in %s on line %i NULL -- Testing stream_set_timeout() function with a closed socket -- @@ -71,8 +71,8 @@ -- Testing stream_set_timeout() function with an invalid stream -- -Warning: stream_set_timeout(): supplied argument is not a valid stream resource in %s on line %i -bool(false) +Warning: stream_set_timeout() expects parameter 1 to be resource, integer given in %s on line %i +NULL -- Testing stream_set_timeout() function with a stream that does not support timeouts -- bool(false)