felipe Sun Aug 10 21:49:01 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard formatted_print.c /php-src/ext/standard/tests/strings vfprintf_error4.phpt Log: - MFH: New parameter parsing API (for *printf()) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/formatted_print.c?r1=1.82.2.1.2.16.2.7&r2=1.82.2.1.2.16.2.8&diff_format=u Index: php-src/ext/standard/formatted_print.c diff -u php-src/ext/standard/formatted_print.c:1.82.2.1.2.16.2.7 php-src/ext/standard/formatted_print.c:1.82.2.1.2.16.2.8 --- php-src/ext/standard/formatted_print.c:1.82.2.1.2.16.2.7 Tue Jul 1 10:01:08 2008 +++ php-src/ext/standard/formatted_print.c Sun Aug 10 21:49:00 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: formatted_print.c,v 1.82.2.1.2.16.2.7 2008/07/01 10:01:08 dmitry Exp $ */ +/* $Id: formatted_print.c,v 1.82.2.1.2.16.2.8 2008/08/10 21:49:00 felipe Exp $ */ #include <math.h> /* modf() */ #include "php.h" @@ -728,7 +728,7 @@ PHP_FUNCTION(fprintf) { php_stream *stream; - zval **arg1; + zval *arg1; char *result; int len; @@ -736,11 +736,11 @@ WRONG_PARAM_COUNT; } - if (zend_get_parameters_ex(1, &arg1)==FAILURE) { + if (zend_parse_parameters(1 TSRMLS_CC, "r", &arg1) == FAILURE) { RETURN_FALSE; } - php_stream_from_zval(stream, arg1); + php_stream_from_zval(stream, &arg1); if ((result=php_formatted_print(ht, &len, 0, 1 TSRMLS_CC))==NULL) { RETURN_FALSE; @@ -759,7 +759,7 @@ PHP_FUNCTION(vfprintf) { php_stream *stream; - zval **arg1; + zval *arg1; char *result; int len; @@ -767,11 +767,11 @@ WRONG_PARAM_COUNT; } - if (zend_get_parameters_ex(1, &arg1)==FAILURE) { + if (zend_parse_parameters(1 TSRMLS_CC, "r", &arg1) == FAILURE) { RETURN_FALSE; } - php_stream_from_zval(stream, arg1); + php_stream_from_zval(stream, &arg1); if ((result=php_formatted_print(ht, &len, 1, 1 TSRMLS_CC))==NULL) { RETURN_FALSE; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_error4.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/strings/vfprintf_error4.phpt diff -u php-src/ext/standard/tests/strings/vfprintf_error4.phpt:1.1.2.1 php-src/ext/standard/tests/strings/vfprintf_error4.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/vfprintf_error4.phpt:1.1.2.1 Fri Jun 20 04:21:58 2008 +++ php-src/ext/standard/tests/strings/vfprintf_error4.phpt Sun Aug 10 21:49:01 2008 @@ -35,7 +35,7 @@ --EXPECTF-- -- Testing vfprintf() function with other strangeties -- -Warning: vfprintf(): supplied argument is not a valid stream resource in %s on line %d +Warning: vfprintf() expects parameter 1 to be resource, string given in %s on line %d bool(false) Warning: vfprintf(): Argument number must be greater than zero in %s on line %d
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php