diff options
| -rw-r--r-- | Zend/zend_API.h | 2 | ||||
| -rw-r--r-- | Zend/zend_builtin_functions.c | 16 | ||||
| -rw-r--r-- | Zend/zend_exceptions.c | 4 |
3 files changed, 12 insertions, 10 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 7d0c8895a3..fc6d0638b2 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -194,6 +194,8 @@ ZEND_API int zend_copy_parameters_array(int param_count, zval *argument_array TS _zend_get_parameters_array(ht, param_count, argument_array TSRMLS_CC) #define zend_get_parameters_array_ex(param_count, argument_array) \ _zend_get_parameters_array_ex(param_count, argument_array TSRMLS_CC) +#define zend_parse_parameters_none() \ + zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") /* Parameter parsing API -- andrei */ diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 0967a89d91..3e3ebec1f6 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1188,8 +1188,8 @@ ZEND_FUNCTION(get_included_files) unsigned int len; int ustr_len; - if (ZEND_NUM_ARGS() != 0) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters_none() == FAILURE) { + return; } array_init(return_value); @@ -1402,8 +1402,8 @@ ZEND_FUNCTION(get_declared_classes) zend_uint mask = ZEND_ACC_INTERFACE; zend_uint comply = 0; - if (ZEND_NUM_ARGS() != 0) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters_none() == FAILURE) { + return; } array_init(return_value); @@ -1418,8 +1418,8 @@ ZEND_FUNCTION(get_declared_interfaces) zend_uint mask = ZEND_ACC_INTERFACE; zend_uint comply = 1; - if (ZEND_NUM_ARGS() != 0) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters_none() == FAILURE) { + return; } array_init(return_value); @@ -1463,8 +1463,8 @@ ZEND_FUNCTION(get_defined_functions) zval *internal; zval *user; - if (ZEND_NUM_ARGS() != 0) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters_none() == FAILURE) { + return; } MAKE_STD_ZVAL(internal); diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index ba99b3bc6a..ffcf9c6cd1 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -197,8 +197,8 @@ ZEND_METHOD(error_exception, __construct) /* }}} */ #define DEFAULT_0_PARAMS \ - if (ZEND_NUM_ARGS() > 0) { \ - ZEND_WRONG_PARAM_COUNT(); \ + if (zend_parse_parameters_none() == FAILURE) { \ + return; \ } static void _default_exception_get_entry(zval *object, char *name, int name_len, zval *return_value TSRMLS_DC) /* {{{ */ |