From: Felipe Pena <felipe@php.net>
Date: Tue, 4 Mar 2008 23:39:15 +0000 (+0000)
Subject: New way for check void parameters
X-Git-Tag: RELEASE_2_0_0a1~252
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2818d4fc51ba9e7061c3da6cbcda6d66a7628eb5;p=php

New way for check void parameters
---

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 24c19c95ad..2c278a7a51 100644
--- 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 73a5a8483b..5b0615c8ef 100644
--- 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 dfafc66b5b..b9af3316ca 100644
--- 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 d399942161..353b28eb8c 100644
--- 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 a1c586d745..56ad91cd33 100755
--- 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 a6eab0f060..a5aa53c424 100755
--- 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 1c7e2aba36..dc85458098 100644
--- 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 5168b617e8..259c8bf2ab 100644
--- 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 0737819eac..c3dea358ee 100644
--- 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 2d50aeb206..1535be7ea3 100644
--- 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 14d8c7e824..e9f6f4d135 100644
--- 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 d368fd6c12..7684bb02ce 100644
--- 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 774649d018..b4067c41a6 100644
--- 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 098ae7d970..d6ab3936ea 100644
--- 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);