Browse Source

Added new macro for check void parameters.

(deprecating ZEND_WRONG_PARAM_COUNT for this cases)
experimental/first_unicode_implementation
Felipe Pena 19 years ago
parent
commit
8e08965be6
  1. 2
      Zend/zend_API.h
  2. 16
      Zend/zend_builtin_functions.c
  3. 4
      Zend/zend_exceptions.c

2
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 */

16
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);

4
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) /* {{{ */

Loading…
Cancel
Save