summaryrefslogtreecommitdiff
path: root/ext/standard
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard')
-rw-r--r--ext/standard/basic_functions.c5
-rw-r--r--ext/standard/dir.c4
-rw-r--r--ext/standard/filestat.c4
-rw-r--r--ext/standard/head.c4
-rw-r--r--ext/standard/info.c20
-rw-r--r--ext/standard/rand.c8
-rw-r--r--ext/standard/streamsfuncs.c8
-rw-r--r--ext/standard/string.c4
-rw-r--r--ext/standard/syslog.c8
-rw-r--r--ext/standard/user_filters.c4
10 files changed, 35 insertions, 34 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 72b2081913..8a9faed615 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1,3 +1,4 @@
+
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
@@ -4866,8 +4867,8 @@ PHP_FUNCTION(time_sleep_until)
Get the name of the owner of the current PHP script */
PHP_FUNCTION(get_current_user)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRING(php_get_current_user(), 1);
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 11dcb0cf8d..de2bf732c4 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -333,8 +333,8 @@ PHP_FUNCTION(getcwd)
char path[MAXPATHLEN];
char *ret=NULL;
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
#if HAVE_GETCWD
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 96d7af9ae4..2707c50da4 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -730,8 +730,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/standard/head.c b/ext/standard/head.c
index 7728b669f2..be172cefea 100644
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -246,8 +246,8 @@ static void php_head_apply_header_list_to_hash(void *data, void *arg TSRMLS_DC)
Return list of headers to be sent / already sent */
PHP_FUNCTION(headers_list)
{
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (!&SG(sapi_headers).headers) {
diff --git a/ext/standard/info.c b/ext/standard/info.c
index d3356e7b64..f9402c809f 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -1082,8 +1082,8 @@ PHPAPI char *php_logo_guid(void)
PHP_FUNCTION(php_logo_guid)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRING(php_logo_guid(), 0);
@@ -1095,8 +1095,8 @@ PHP_FUNCTION(php_logo_guid)
PHP_FUNCTION(php_real_logo_guid)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRINGL(PHP_LOGO_GUID, sizeof(PHP_LOGO_GUID)-1, 1);
@@ -1107,8 +1107,8 @@ PHP_FUNCTION(php_real_logo_guid)
Return the special ID used to request the PHP logo in phpinfo screens*/
PHP_FUNCTION(php_egg_logo_guid)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRINGL(PHP_EGG_LOGO_GUID, sizeof(PHP_EGG_LOGO_GUID)-1, 1);
@@ -1119,8 +1119,8 @@ PHP_FUNCTION(php_egg_logo_guid)
Return the special ID used to request the Zend logo in phpinfo screens*/
PHP_FUNCTION(zend_logo_guid)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRINGL(ZEND_LOGO_GUID, sizeof(ZEND_LOGO_GUID)-1, 1);
@@ -1131,8 +1131,8 @@ PHP_FUNCTION(zend_logo_guid)
Return the current SAPI module name */
PHP_FUNCTION(php_sapi_name)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (sapi_module.name) {
diff --git a/ext/standard/rand.c b/ext/standard/rand.c
index 1aa8fce8e6..d04094b00f 100644
--- a/ext/standard/rand.c
+++ b/ext/standard/rand.c
@@ -351,8 +351,8 @@ PHP_FUNCTION(mt_rand)
Returns the maximum value a random number can have */
PHP_FUNCTION(getrandmax)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_LONG(PHP_RAND_MAX);
@@ -363,8 +363,8 @@ PHP_FUNCTION(getrandmax)
Returns the maximum value a random number from Mersenne Twister can have */
PHP_FUNCTION(mt_getrandmax)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
/*
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 699c596315..ecd18f9aa9 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -520,8 +520,8 @@ PHP_FUNCTION(stream_get_transports)
int stream_xport_len;
ulong num_key;
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if ((stream_xport_hash = php_stream_xport_get_hash())) {
@@ -548,8 +548,8 @@ PHP_FUNCTION(stream_get_wrappers)
int key_flags, stream_protocol_len = 0;
ulong num_key;
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if ((url_stream_wrappers_hash = php_stream_get_url_stream_wrappers_hash())) {
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 51505e413b..cc52e0ba77 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -4683,8 +4683,8 @@ PHP_FUNCTION(localeconv)
int len, i;
/* We don't need no stinkin' parameters... */
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
MAKE_STD_ZVAL(grouping);
diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c
index 351a477ec1..392f671ac2 100644
--- a/ext/standard/syslog.c
+++ b/ext/standard/syslog.c
@@ -203,8 +203,8 @@ static void start_syslog(TSRMLS_D)
Initializes all syslog-related variables */
PHP_FUNCTION(define_syslog_variables)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (!BG(syslog_started)) {
@@ -243,8 +243,8 @@ PHP_FUNCTION(openlog)
Close connection to system logger */
PHP_FUNCTION(closelog)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
closelog();
diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index ecf36cbc18..176acb20de 100644
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -534,8 +534,8 @@ PHP_FUNCTION(stream_get_filters)
HashTable *filters_hash;
ulong num_key;
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
array_init(return_value);
View Lorry Controller Status