New way for check void parameters

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 24c19c95adf37150c9e955fd6175578d1f46d7de..2c278a7a51ca30fd0e2302ff4be62d00d46d9a3e 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -299,8 +299,8 @@ struct _php_timezone_obj {
        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) {     \

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 73a5a8483be890ee19e2eec8a79f070773a75f6f..5b0615c8eff8545672a74d9c1e28f17aca961976 100644 (file)
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -843,8 +843,8 @@ PHP_FUNCTION(filter_list)
 {
        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);

diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index dfafc66b5b1e45a29850ff07fa277859af79640f..b9af3316cac4b6eca045db43f4e72190c73df6ab 100644 (file)
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -747,8 +747,8 @@ PHP_FUNCTION(msql_list_fields)
    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);
 }

diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index d399942161cca6608a27e4d3c20d8adca2c11a1b..353b28eb8cc3cd91550fd834e38f602951f539d3 100644 (file)
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -397,8 +397,8 @@ PHP_FUNCTION(mysqli_fetch_all)
    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 @@ PHP_FUNCTION(mysqli_get_cache_stats)
    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);
 }

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index a1c586d745d182d9f84c92c807c8795671c772e2..56ad91cd334f6867cf4cc2110c66a188803504c9 100755 (executable)
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -979,8 +979,8 @@ static PHP_METHOD(PDO, errorCode)
 {
        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 @@ static PHP_METHOD(PDO, errorInfo)
 {
        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 @@ static PHP_METHOD(PDO, getAvailableDrivers)
        HashPosition pos;
        pdo_driver_t **pdriver;
 
-       if (ZEND_NUM_ARGS()) {
-               WRONG_PARAM_COUNT;
+       if (zend_parse_parameters_none() == FAILURE) {
+               return;
        }
        
        array_init(return_value);

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index a6eab0f060ed691d5173ce95b7dd1adb9d4c4a95..a5aa53c424edd11427a26dc2a34c2cb988c60fbb 100755 (executable)
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -1701,8 +1701,8 @@ static PHP_METHOD(PDOStatement, errorCode)
 {
        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 @@ static PHP_METHOD(PDOStatement, errorInfo)
 {
        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, getAttribute)
 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);
 }

diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 1c7e2aba36a8cbb1969bf33f22a3bfd2619a00df..dc8545809883d568c28a2390c1d709e1ab9c6fb9 100644 (file)
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -209,7 +209,7 @@ zend_module_entry posix_module_entry = {
 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       \

diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 5168b617e86fff8870db7bbca95f3ae9f20f61b2..259c8bf2ab975a606c14119903b5c800a41be25f 100644 (file)
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -798,8 +798,8 @@ PHPAPI void php_clear_stat_cache(TSRMLS_D)
    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);
 }

diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 0737819eac8abfc3fea1b58b655f14227d400071..c3dea358eea357dbd843e046eff9500493bafe1f 100644 (file)
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -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);    \
 
@@ -1319,8 +1319,8 @@ static PHP_FUNCTION(tidy_diagnose)
    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);

diff --git a/ext/unicode/collator.c b/ext/unicode/collator.c
index 2d50aeb2064346cc242931f74fe278577ba9b3b2..1535be7ea357086dd753eb9afb2ce1faf4b03fc0 100644 (file)
--- a/ext/unicode/collator.c
+++ b/ext/unicode/collator.c
@@ -56,8 +56,8 @@ struct _php_collator_obj {
        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) {      \

diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c
index 14d8c7e8244f0d7726de81d91e99918503269394..e9f6f4d135d6e8fd6f934782a89505a2c55ca19b 100644 (file)
--- a/ext/xmlwriter/php_xmlwriter.c
+++ b/ext/xmlwriter/php_xmlwriter.c
@@ -468,8 +468,8 @@ static void php_xmlwriter_end(INTERNAL_FUNCTION_PARAMETERS, xmlwriter_read_int_t
        
        if (this) {
                XMLWRITER_FROM_OBJECT(intern, this);
-               if (ZEND_NUM_ARGS()) {
-                       WRONG_PARAM_COUNT;
+               if (zend_parse_parameters_none() == FAILURE) {
+                       return;
                }
        } else 
 #endif

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index d368fd6c122ab98df66d5657ac159d27c0642556..7684bb02ceb2fcad34382d306948eec39a757113 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -384,8 +384,8 @@ retry_raw_inflate:
    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:

diff --git a/main/output.c b/main/output.c
index 774649d018bac1ab7dae8ff94ad800432c710859..b4067c41a6e3cd0662d998e27f5b016a9e1febe4 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -1355,8 +1355,8 @@ PHP_FUNCTION(ob_start)
    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 @@ PHP_FUNCTION(ob_flush)
    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 @@ PHP_FUNCTION(ob_clean)
    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 @@ PHP_FUNCTION(ob_end_flush)
    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 @@ PHP_FUNCTION(ob_end_clean)
    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 @@ PHP_FUNCTION(ob_get_flush)
    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 @@ PHP_FUNCTION(ob_get_clean)
    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 @@ PHP_FUNCTION(ob_get_contents)
    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 @@ PHP_FUNCTION(ob_get_level)
    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_get_length)
  */
 PHP_FUNCTION(ob_list_handlers)
 {
-       if (ZEND_NUM_ARGS()) {
-               ZEND_WRONG_PARAM_COUNT();
+       if (zend_parse_parameters_none() == FAILURE) {
+               return;
        }
 
        array_init(return_value);

diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 098ae7d9706440dadeb9043db80c59a3ad577381..d6ab3936ea90b90e31dfc90524201bdacb0dd029 100644 (file)
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -179,8 +179,8 @@ PHP_FUNCTION(apache_request_headers)
        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 @@ PHP_FUNCTION(apache_response_headers)
        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);