felipe Tue Mar 4 23:39:16 2008 UTC Modified files: /php-src/sapi/apache2handler php_functions.c /php-src/main output.c /php-src/ext/zlib zlib.c /php-src/ext/xmlwriter php_xmlwriter.c /php-src/ext/unicode collator.c /php-src/ext/tidy tidy.c /php-src/ext/standard filestat.c /php-src/ext/posix posix.c /php-src/ext/pdo pdo_stmt.c pdo_dbh.c /php-src/ext/mysqli mysqli_nonapi.c /php-src/ext/msql php_msql.c /php-src/ext/filter filter.c /php-src/ext/date php_date.c Log: New way for check void parameters
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.31&r2=1.32&diff_format=u Index: php-src/sapi/apache2handler/php_functions.c diff -u php-src/sapi/apache2handler/php_functions.c:1.31 php-src/sapi/apache2handler/php_functions.c:1.32 --- php-src/sapi/apache2handler/php_functions.c:1.31 Mon Dec 31 07:12:19 2007 +++ php-src/sapi/apache2handler/php_functions.c Tue Mar 4 23:39:14 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_functions.c,v 1.31 2007/12/31 07:12:19 sebastian Exp $ */ +/* $Id: php_functions.c,v 1.32 2008/03/04 23:39:14 felipe Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -179,8 +179,8 @@ const apr_array_header_t *arr; char *key, *val; - if (ZEND_NUM_ARGS()) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters_none() == FAILURE) { + return; } array_init(return_value); @@ -203,8 +203,8 @@ const apr_array_header_t *arr; char *key, *val; - if (ZEND_NUM_ARGS()) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters_none() == FAILURE) { + return; } array_init(return_value); http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.209&r2=1.210&diff_format=u Index: php-src/main/output.c diff -u php-src/main/output.c:1.209 php-src/main/output.c:1.210 --- php-src/main/output.c:1.209 Sat Feb 2 23:25:43 2008 +++ php-src/main/output.c Tue Mar 4 23:39:15 2008 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: output.c,v 1.209 2008/02/02 23:25:43 helly Exp $ */ +/* $Id: output.c,v 1.210 2008/03/04 23:39:15 felipe Exp $ */ #ifndef PHP_OUTPUT_DEBUG # define PHP_OUTPUT_DEBUG 0 @@ -1355,8 +1355,8 @@ Flush (send) contents of the output buffer. The last buffer content is sent to next buffer */ PHP_FUNCTION(ob_flush) { - if (ZEND_NUM_ARGS()) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters_none() == FAILURE) { + return; } if (!OG(active)) { @@ -1376,8 +1376,8 @@ Clean (delete) the current output buffer */ PHP_FUNCTION(ob_clean) { - if (ZEND_NUM_ARGS()) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters_none() == FAILURE) { + return; } if (!OG(active)) { @@ -1396,8 +1396,8 @@ Flush (send) the output buffer, and delete current output buffer */ PHP_FUNCTION(ob_end_flush) { - if (ZEND_NUM_ARGS()) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters_none() == FAILURE) { + return; } if (!OG(active)) { @@ -1412,8 +1412,8 @@ Clean the output buffer, and delete current output buffer */ PHP_FUNCTION(ob_end_clean) { - if (ZEND_NUM_ARGS()) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters_none() == FAILURE) { + return; } if (!OG(active)) { @@ -1428,8 +1428,8 @@ Get current buffer contents, flush (send) the output buffer, and delete current output buffer */ PHP_FUNCTION(ob_get_flush) { - if (ZEND_NUM_ARGS()) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters_none() == FAILURE) { + return; } if (SUCCESS != php_output_get_contents(return_value TSRMLS_CC)) { @@ -1446,8 +1446,8 @@ Get current buffer contents and delete current output buffer */ PHP_FUNCTION(ob_get_clean) { - if (ZEND_NUM_ARGS()) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters_none() == FAILURE) { + return; } if (SUCCESS != php_output_get_contents(return_value TSRMLS_CC)) { @@ -1464,8 +1464,8 @@ Return the contents of the output buffer */ PHP_FUNCTION(ob_get_contents) { - if (ZEND_NUM_ARGS()) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters_none() == FAILURE) { + return; } if (SUCCESS != php_output_get_contents(return_value TSRMLS_CC)) { RETURN_FALSE; @@ -1477,8 +1477,8 @@ Return the nesting level of the output buffer */ PHP_FUNCTION(ob_get_level) { - if (ZEND_NUM_ARGS()) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters_none() == FAILURE) { + return; } RETURN_LONG(php_output_get_level(TSRMLS_C)); } @@ -1488,8 +1488,8 @@ Return the length of the output buffer */ PHP_FUNCTION(ob_get_length) { - if (ZEND_NUM_ARGS()) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters_none() == FAILURE) { + return; } if (SUCCESS != php_output_get_length(return_value TSRMLS_CC)) { RETURN_FALSE; @@ -1502,8 +1502,8 @@ */ PHP_FUNCTION(ob_list_handlers) { - if (ZEND_NUM_ARGS()) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters_none() == FAILURE) { + return; } array_init(return_value); http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.217&r2=1.218&diff_format=u Index: php-src/ext/zlib/zlib.c diff -u php-src/ext/zlib/zlib.c:1.217 php-src/ext/zlib/zlib.c:1.218 --- php-src/ext/zlib/zlib.c:1.217 Mon Dec 31 07:12:18 2007 +++ php-src/ext/zlib/zlib.c Tue Mar 4 23:39:15 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.217 2007/12/31 07:12:18 sebastian Exp $ */ +/* $Id: zlib.c,v 1.218 2008/03/04 23:39:15 felipe Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -384,8 +384,8 @@ Returns the coding type used for output compression */ PHP_FUNCTION(zlib_get_coding_type) { - if (ZEND_NUM_ARGS()) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters_none() == FAILURE) { + return; } switch (ZLIBG(compression_coding)) { case PHP_ZLIB_ENCODING_GZIP: http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.51&r2=1.52&diff_format=u Index: php-src/ext/xmlwriter/php_xmlwriter.c diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.51 php-src/ext/xmlwriter/php_xmlwriter.c:1.52 --- php-src/ext/xmlwriter/php_xmlwriter.c:1.51 Mon Dec 31 07:12:17 2007 +++ php-src/ext/xmlwriter/php_xmlwriter.c Tue Mar 4 23:39:15 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlwriter.c,v 1.51 2007/12/31 07:12:17 sebastian Exp $ */ +/* $Id: php_xmlwriter.c,v 1.52 2008/03/04 23:39:15 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -468,8 +468,8 @@ if (this) { XMLWRITER_FROM_OBJECT(intern, this); - if (ZEND_NUM_ARGS()) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters_none() == FAILURE) { + return; } } else #endif http://cvs.php.net/viewvc.cgi/php-src/ext/unicode/collator.c?r1=1.16&r2=1.17&diff_format=u Index: php-src/ext/unicode/collator.c diff -u php-src/ext/unicode/collator.c:1.16 php-src/ext/unicode/collator.c:1.17 --- php-src/ext/unicode/collator.c:1.16 Thu Feb 28 14:16:24 2008 +++ php-src/ext/unicode/collator.c Tue Mar 4 23:39:15 2008 @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: collator.c,v 1.16 2008/02/28 14:16:24 felipe Exp $ */ +/* $Id: collator.c,v 1.17 2008/03/04 23:39:15 felipe Exp $ */ #include "php.h" #include "ext/standard/php_array.h" @@ -56,8 +56,8 @@ php_collator_obj *obj; \ COLLATOR_SET_CONTEXT; \ if (object) { \ - if (ZEND_NUM_ARGS()) { \ - WRONG_PARAM_COUNT; \ + if (zend_parse_parameters_none() == FAILURE) { \ + return; \ } \ } else { \ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, NULL, "O", &object, unicode_ce_collator) == FAILURE) { \ http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.120&r2=1.121&diff_format=u Index: php-src/ext/tidy/tidy.c diff -u php-src/ext/tidy/tidy.c:1.120 php-src/ext/tidy/tidy.c:1.121 --- php-src/ext/tidy/tidy.c:1.120 Sun Jan 27 15:03:55 2008 +++ php-src/ext/tidy/tidy.c Tue Mar 4 23:39:15 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tidy.c,v 1.120 2008/01/27 15:03:55 helly Exp $ */ +/* $Id: tidy.c,v 1.121 2008/03/04 23:39:15 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -51,8 +51,8 @@ PHPTidyObj *obj; \ TIDY_SET_CONTEXT; \ if (object) { \ - if (ZEND_NUM_ARGS()) { \ - WRONG_PARAM_COUNT; \ + if (zend_parse_parameters_none() == FAILURE) { \ + return; \ } \ } else { \ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, NULL, "O", &object, tidy_ce_doc) == FAILURE) { \ @@ -64,8 +64,8 @@ #define TIDY_FETCH_ONLY_OBJECT \ PHPTidyObj *obj; \ TIDY_SET_CONTEXT; \ - if (ZEND_NUM_ARGS()) { \ - WRONG_PARAM_COUNT; \ + if (zend_parse_parameters_none() == FAILURE) { \ + return; \ } \ obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC); \ @@ -1062,7 +1062,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Tidy support", "enabled"); php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate()); - php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.120 2008/01/27 15:03:55 helly Exp $)"); + php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.121 2008/03/04 23:39:15 felipe Exp $)"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -1319,8 +1319,8 @@ Get release date (version) for Tidy library */ static PHP_FUNCTION(tidy_get_release) { - if (ZEND_NUM_ARGS()) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters_none() == FAILURE) { + return; } RETURN_ASCII_STRING((char *)tidyReleaseDate(), ZSTR_DUPLICATE); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.172&r2=1.173&diff_format=u Index: php-src/ext/standard/filestat.c diff -u php-src/ext/standard/filestat.c:1.172 php-src/ext/standard/filestat.c:1.173 --- php-src/ext/standard/filestat.c:1.172 Mon Dec 31 07:12:15 2007 +++ php-src/ext/standard/filestat.c Tue Mar 4 23:39:15 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filestat.c,v 1.172 2007/12/31 07:12:15 sebastian Exp $ */ +/* $Id: filestat.c,v 1.173 2008/03/04 23:39:15 felipe Exp $ */ #include "php.h" #include "fopen_wrappers.h" @@ -798,8 +798,8 @@ Clear file stat cache */ PHP_FUNCTION(clearstatcache) { - if (ZEND_NUM_ARGS()) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters_none() == FAILURE) { + return; } php_clear_stat_cache(TSRMLS_C); } http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.96&r2=1.97&diff_format=u Index: php-src/ext/posix/posix.c diff -u php-src/ext/posix/posix.c:1.96 php-src/ext/posix/posix.c:1.97 --- php-src/ext/posix/posix.c:1.96 Mon Dec 31 07:12:13 2007 +++ php-src/ext/posix/posix.c Tue Mar 4 23:39:15 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.96 2007/12/31 07:12:13 sebastian Exp $ */ +/* $Id: posix.c,v 1.97 2008/03/04 23:39:15 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -147,7 +147,7 @@ static PHP_MINFO_FUNCTION(posix) { php_info_print_table_start(); - php_info_print_table_row(2, "Revision", "$Revision: 1.96 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.97 $"); php_info_print_table_end(); } /* }}} */ @@ -209,7 +209,7 @@ ZEND_GET_MODULE(posix) #endif -#define PHP_POSIX_NO_ARGS if (ZEND_NUM_ARGS()) WRONG_PARAM_COUNT; +#define PHP_POSIX_NO_ARGS if (zend_parse_parameters_none() == FAILURE) return; #define PHP_POSIX_RETURN_LONG_FUNC(func_name) \ PHP_POSIX_NO_ARGS \ http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.189&r2=1.190&diff_format=u Index: php-src/ext/pdo/pdo_stmt.c diff -u php-src/ext/pdo/pdo_stmt.c:1.189 php-src/ext/pdo/pdo_stmt.c:1.190 --- php-src/ext/pdo/pdo_stmt.c:1.189 Mon Mar 3 18:58:59 2008 +++ php-src/ext/pdo/pdo_stmt.c Tue Mar 4 23:39:15 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_stmt.c,v 1.189 2008/03/03 18:58:59 johannes Exp $ */ +/* $Id: pdo_stmt.c,v 1.190 2008/03/04 23:39:15 felipe Exp $ */ /* The PDO Statement Handle Class */ @@ -1701,8 +1701,8 @@ { PHP_STMT_GET_OBJ; - if (ZEND_NUM_ARGS()) { - RETURN_FALSE; + if (zend_parse_parameters_none() == FAILURE) { + return; } RETURN_STRING(stmt->error_code, 1); @@ -1715,8 +1715,8 @@ { PHP_STMT_GET_OBJ; - if (ZEND_NUM_ARGS()) { - RETURN_FALSE; + if (zend_parse_parameters_none() == FAILURE) { + return; } array_init(return_value); @@ -1816,8 +1816,8 @@ static PHP_METHOD(PDOStatement, columnCount) { PHP_STMT_GET_OBJ; - if (ZEND_NUM_ARGS()) { - RETURN_FALSE; + if (zend_parse_parameters_none() == FAILURE) { + return; } RETURN_LONG(stmt->column_count); } http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.148&r2=1.149&diff_format=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.148 php-src/ext/pdo/pdo_dbh.c:1.149 --- php-src/ext/pdo/pdo_dbh.c:1.148 Mon Mar 3 21:13:29 2008 +++ php-src/ext/pdo/pdo_dbh.c Tue Mar 4 23:39:15 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dbh.c,v 1.148 2008/03/03 21:13:29 iliaa Exp $ */ +/* $Id: pdo_dbh.c,v 1.149 2008/03/04 23:39:15 felipe Exp $ */ /* The PDO Database Handle Class */ @@ -979,8 +979,8 @@ { pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC); - if (ZEND_NUM_ARGS()) { - RETURN_FALSE; + if (zend_parse_parameters_none() == FAILURE) { + return; } PDO_CONSTRUCT_CHECK; @@ -998,8 +998,8 @@ { pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC); - if (ZEND_NUM_ARGS()) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters_none() == FAILURE) { + return; } PDO_CONSTRUCT_CHECK; @@ -1141,8 +1141,8 @@ HashPosition pos; pdo_driver_t **pdriver; - if (ZEND_NUM_ARGS()) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters_none() == FAILURE) { + return; } array_init(return_value); http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.78&r2=1.79&diff_format=u Index: php-src/ext/mysqli/mysqli_nonapi.c diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.78 php-src/ext/mysqli/mysqli_nonapi.c:1.79 --- php-src/ext/mysqli/mysqli_nonapi.c:1.78 Fri Feb 8 09:57:01 2008 +++ php-src/ext/mysqli/mysqli_nonapi.c Tue Mar 4 23:39:15 2008 @@ -17,7 +17,7 @@ | Ulf Wendel <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: mysqli_nonapi.c,v 1.78 2008/02/08 09:57:01 andrey Exp $ + $Id: mysqli_nonapi.c,v 1.79 2008/03/04 23:39:15 felipe Exp $ */ #ifdef HAVE_CONFIG_H @@ -397,8 +397,8 @@ Returns statistics about the zval cache */ PHP_FUNCTION(mysqli_get_cache_stats) { - if (ZEND_NUM_ARGS()) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters_none() == FAILURE) { + return; } mysqlnd_palloc_stats(mysqli_mysqlnd_zval_cache, return_value); } @@ -409,8 +409,8 @@ Returns statistics about the zval cache */ PHP_FUNCTION(mysqli_get_client_stats) { - if (ZEND_NUM_ARGS()) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters_none() == FAILURE) { + return; } mysqlnd_get_client_stats(return_value); } http://cvs.php.net/viewvc.cgi/php-src/ext/msql/php_msql.c?r1=1.69&r2=1.70&diff_format=u Index: php-src/ext/msql/php_msql.c diff -u php-src/ext/msql/php_msql.c:1.69 php-src/ext/msql/php_msql.c:1.70 --- php-src/ext/msql/php_msql.c:1.69 Mon Dec 31 07:12:11 2007 +++ php-src/ext/msql/php_msql.c Tue Mar 4 23:39:15 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.69 2007/12/31 07:12:11 sebastian Exp $ */ +/* $Id: php_msql.c,v 1.70 2008/03/04 23:39:15 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -747,8 +747,8 @@ Returns the text of the error message from previous mSQL operation */ PHP_FUNCTION(msql_error) { - if (ZEND_NUM_ARGS()) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters_none() == FAILURE) { + return; } RETURN_STRING(msqlErrMsg,1); } http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.93&r2=1.94&diff_format=u Index: php-src/ext/filter/filter.c diff -u php-src/ext/filter/filter.c:1.93 php-src/ext/filter/filter.c:1.94 --- php-src/ext/filter/filter.c:1.93 Sun Feb 24 18:42:09 2008 +++ php-src/ext/filter/filter.c Tue Mar 4 23:39:15 2008 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter.c,v 1.93 2008/02/24 18:42:09 felipe Exp $ */ +/* $Id: filter.c,v 1.94 2008/03/04 23:39:15 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -275,7 +275,7 @@ { php_info_print_table_start(); php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" ); - php_info_print_table_row( 2, "Revision", "$Revision: 1.93 $"); + php_info_print_table_row( 2, "Revision", "$Revision: 1.94 $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -843,8 +843,8 @@ { int i, size = sizeof(filter_list) / sizeof(filter_list_entry); - if (ZEND_NUM_ARGS()) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters_none() == FAILURE) { + return; } array_init(return_value); http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.168&r2=1.169&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.168 php-src/ext/date/php_date.c:1.169 --- php-src/ext/date/php_date.c:1.168 Wed Feb 27 09:47:23 2008 +++ php-src/ext/date/php_date.c Tue Mar 4 23:39:15 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.c,v 1.168 2008/02/27 09:47:23 derick Exp $ */ +/* $Id: php_date.c,v 1.169 2008/03/04 23:39:15 felipe Exp $ */ #include "php.h" #include "php_streams.h" @@ -299,8 +299,8 @@ php_date_obj *obj; \ DATE_SET_CONTEXT; \ if (object) { \ - if (ZEND_NUM_ARGS()) { \ - WRONG_PARAM_COUNT; \ + if (zend_parse_parameters_none() == FAILURE) { \ + return; \ } \ } else { \ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, NULL, "O", &object, date_ce_date) == FAILURE) { \
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php