MFH: Fix double "wron param count" messages

This commit is contained in:
Hannes Magnusson 2006-11-03 14:46:48 +00:00
parent 11c47dc510
commit 050f94f746
8 changed files with 15 additions and 17 deletions

View File

@ -461,7 +461,7 @@ PHP_FUNCTION(bcpowmod)
long scale = BCG(bc_precision);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss|l", &left, &left_len, &right, &right_len, &modulous, &modulous_len, &scale) == FAILURE) {
WRONG_PARAM_COUNT;
return;
}
bc_init_num(&first TSRMLS_CC);

View File

@ -1177,7 +1177,6 @@ PHP_FUNCTION(dba_handlers)
zend_bool full_info = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &full_info) == FAILURE) {
ZEND_WRONG_PARAM_COUNT();
RETURN_FALSE;
}

View File

@ -111,7 +111,7 @@ PHP_FUNCTION(mhash_get_block_size)
long hash;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &hash) == FAILURE) {
WRONG_PARAM_COUNT;
return;
}
RETURN_LONG(mhash_get_block_size(hash));
@ -127,7 +127,7 @@ PHP_FUNCTION(mhash_get_hash_name)
long hash;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &hash) == FAILURE) {
WRONG_PARAM_COUNT;
return;
}
name = mhash_get_hash_name(hash);
@ -153,7 +153,7 @@ PHP_FUNCTION(mhash)
char *data, *key=NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ls|s", &hash, &data, &data_len, &key, &key_len) == FAILURE) {
WRONG_PARAM_COUNT;
return;
}
bsize = mhash_get_block_size(hash);
@ -202,7 +202,7 @@ PHP_FUNCTION(mhash_keygen_s2k)
int password_len, salt_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lssl", &hash, &password, &password_len, &in_salt, &salt_len, &bytes) == FAILURE) {
WRONG_PARAM_COUNT;
return;
}
if (bytes <= 0){
php_error_docref(NULL TSRMLS_CC, E_WARNING, "the byte parameter must be greater than 0");

View File

@ -1528,7 +1528,7 @@ PHP_FUNCTION(session_regenerate_id)
zend_bool del_ses = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &del_ses) == FAILURE) {
WRONG_PARAM_COUNT;
return;
}
if (SG(headers_sent)) {

View File

@ -121,7 +121,7 @@ PHP_FUNCTION(shmop_open)
int flags_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lsll", &key, &flags, &flags_len, &mode, &size) == FAILURE) {
WRONG_PARAM_COUNT;
return;
}
if (flags_len != 1) {
@ -198,7 +198,7 @@ PHP_FUNCTION(shmop_read)
char *return_string;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lll", &shmid, &start, &count) == FAILURE) {
WRONG_PARAM_COUNT;
return;
}
shmop = zend_list_find(shmid, &type);
@ -238,7 +238,7 @@ PHP_FUNCTION(shmop_close)
int type;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &shmid) == FAILURE) {
WRONG_PARAM_COUNT;
return;
}
shmop = zend_list_find(shmid, &type);
@ -261,7 +261,7 @@ PHP_FUNCTION(shmop_size)
int type;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &shmid) == FAILURE) {
WRONG_PARAM_COUNT;
return;
}
shmop = zend_list_find(shmid, &type);
@ -287,7 +287,7 @@ PHP_FUNCTION(shmop_write)
int data_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lsl", &shmid, &data, &data_len, &offset) == FAILURE) {
WRONG_PARAM_COUNT;
return;
}
shmop = zend_list_find(shmid, &type);
@ -323,7 +323,7 @@ PHP_FUNCTION(shmop_delete)
int type;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &shmid) == FAILURE) {
WRONG_PARAM_COUNT;
return;
}
shmop = zend_list_find(shmid, &type);

View File

@ -4725,7 +4725,7 @@ PHP_FUNCTION(time_nanosleep)
struct timespec php_req, php_rem;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &tv_sec, &tv_nsec)) {
WRONG_PARAM_COUNT;
return;
}
php_req.tv_sec = (time_t) tv_sec;
@ -4754,7 +4754,7 @@ PHP_FUNCTION(time_sleep_until)
struct timespec php_req, php_rem;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &d_ts)) {
WRONG_PARAM_COUNT;
return;
}
if (gettimeofday((struct timeval *) &tm, NULL) != 0) {

View File

@ -1003,7 +1003,7 @@ static PHP_FUNCTION(ob_tidyhandler)
TidyDoc doc;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &input, &input_len, &mode) == FAILURE) {
WRONG_PARAM_COUNT;
return;
}
doc = tidyCreate();

View File

@ -1345,7 +1345,6 @@ PHP_FUNCTION(xmlwriter_open_uri)
#endif
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &source, &source_len) == FAILURE) {
WRONG_PARAM_COUNT;
return;
}