clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

MFH: Added new macro for check void parameters.

Browse Source 
(deprecating ZEND_WRONG_PARAM_COUNT for this cases)
This commit is contained in:
Felipe Pena 2008-03-10 22:02:41 +00:00
parent 725b31fc6c
commit cc2b17d51d
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zend/zend_API.h
View File

@ -189,7 +189,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 */

20
Zend/zend_builtin_functions.c
View File

@ -1182,8 +1182,8 @@ ZEND_FUNCTION(crash)
ZEND_FUNCTION(get_included_files)
{
char *entry;
if (ZEND_NUM_ARGS() != 0) {
ZEND_WRONG_PARAM_COUNT();
if (zend_parse_parameters_none() == FAILURE) {
return;
}
array_init(return_value);
@ -1394,8 +1394,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);
@ -1410,8 +1410,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);
@ -1446,8 +1446,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);
@ -1763,8 +1763,8 @@ ZEND_FUNCTION(debug_print_backtrace)
zval *arg_array = NULL;
int indent = 0;
if (ZEND_NUM_ARGS()) {
ZEND_WRONG_PARAM_COUNT();
if (zend_parse_parameters_none() == FAILURE) {
return;
}
ptr = EG(current_execute_data);

4
Zend/zend_exceptions.c
View File

@ -182,8 +182,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) /* {{{ */