cvs: php-src(PHP_5_2) /ext/bcmath bcmath.c /ext/dba dba.c /ext/mhash mhash.c /ext/session session.c /ext/shmop shmop.c /ext/standard
basic_functions.c /ext/tidy tidy.c /ext/xmlwriter php_xmlwriter.c

bjori Fri Nov 3 14:46:49 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/bcmath bcmath.c /php-src/ext/dba dba.c /php-src/ext/mhash mhash.c /php-src/ext/session session.c /php-src/ext/shmop shmop.c /php-src/ext/standard basic_functions.c /php-src/ext/tidy tidy.c /php-src/ext/xmlwriter php_xmlwriter.c Log: MFH: Fix double "wron param count" messages

http://cvs.php.net/viewvc.cgi/php-src/ext/bcmath/bcmath.c?r1=1.62.2.2.2.2&r2=1.62.2.2.2.3&diff_format=u Index: php-src/ext/bcmath/bcmath.c diff -u php-src/ext/bcmath/bcmath.c:1.62.2.2.2.2 php-src/ext/bcmath/bcmath.c:1.62.2.2.2.3 --- php-src/ext/bcmath/bcmath.c:1.62.2.2.2.2 Thu Jun 15 18:33:06 2006 +++ php-src/ext/bcmath/bcmath.c Fri Nov 3 14:46:48 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bcmath.c,v 1.62.2.2.2.2 2006/06/15 18:33:06 dmitry Exp $ */ +/* $Id: bcmath.c,v 1.62.2.2.2.3 2006/11/03 14:46:48 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -461,7 +461,7 @@ 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); http://cvs.php.net/viewvc.cgi/php-src/ext/dba/dba.c?r1=1.111.2.4.2.3&r2=1.111.2.4.2.4&diff_format=u Index: php-src/ext/dba/dba.c diff -u php-src/ext/dba/dba.c:1.111.2.4.2.3 php-src/ext/dba/dba.c:1.111.2.4.2.4 --- php-src/ext/dba/dba.c:1.111.2.4.2.3 Thu Jul 6 23:13:18 2006 +++ php-src/ext/dba/dba.c Fri Nov 3 14:46:48 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.111.2.4.2.3 2006/07/06 23:13:18 iliaa Exp $ */ +/* $Id: dba.c,v 1.111.2.4.2.4 2006/11/03 14:46:48 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1177,7 +1177,6 @@ zend_bool full_info = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &full_info) == FAILURE) { - ZEND_WRONG_PARAM_COUNT(); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/mhash/mhash.c?r1=1.48.2.3&r2=1.48.2.3.2.1&diff_format=u Index: php-src/ext/mhash/mhash.c diff -u php-src/ext/mhash/mhash.c:1.48.2.3 php-src/ext/mhash/mhash.c:1.48.2.3.2.1 --- php-src/ext/mhash/mhash.c:1.48.2.3 Mon Apr 3 09:14:33 2006 +++ php-src/ext/mhash/mhash.c Fri Nov 3 14:46:48 2006 @@ -16,7 +16,7 @@ | Nikos Mavroyanopoulos <nmav@hellug.gr> (HMAC, KEYGEN) | +----------------------------------------------------------------------+ */ -/* $Id: mhash.c,v 1.48.2.3 2006/04/03 09:14:33 tony2001 Exp $ */ +/* $Id: mhash.c,v 1.48.2.3.2.1 2006/11/03 14:46:48 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -111,7 +111,7 @@ 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 @@ 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 @@ 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 @@ 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"); http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.16&r2=1.417.2.8.2.17&diff_format=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.417.2.8.2.16 php-src/ext/session/session.c:1.417.2.8.2.17 --- php-src/ext/session/session.c:1.417.2.8.2.16 Fri Oct 6 21:11:36 2006 +++ php-src/ext/session/session.c Fri Nov 3 14:46:48 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.417.2.8.2.16 2006/10/06 21:11:36 iliaa Exp $ */ +/* $Id: session.c,v 1.417.2.8.2.17 2006/11/03 14:46:48 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1528,7 +1528,7 @@ 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)) { http://cvs.php.net/viewvc.cgi/php-src/ext/shmop/shmop.c?r1=1.31.2.2&r2=1.31.2.2.2.1&diff_format=u Index: php-src/ext/shmop/shmop.c diff -u php-src/ext/shmop/shmop.c:1.31.2.2 php-src/ext/shmop/shmop.c:1.31.2.2.2.1 --- php-src/ext/shmop/shmop.c:1.31.2.2 Sun Jan 1 12:50:13 2006 +++ php-src/ext/shmop/shmop.c Fri Nov 3 14:46:48 2006 @@ -16,7 +16,7 @@ | Ilia Alshanetsky <ilia@prohost.org> | +----------------------------------------------------------------------+ */ -/* $Id: shmop.c,v 1.31.2.2 2006/01/01 12:50:13 sniper Exp $ */ +/* $Id: shmop.c,v 1.31.2.2.2.1 2006/11/03 14:46:48 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -121,7 +121,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ int type; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &shmid) == FAILURE) { - WRONG_PARAM_COUNT; + return; } shmop = zend_list_find(shmid, &type); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.28&r2=1.725.2.31.2.29&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.28 php-src/ext/standard/basic_functions.c:1.725.2.31.2.29 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.28 Fri Oct 13 01:42:19 2006 +++ php-src/ext/standard/basic_functions.c Fri Nov 3 14:46:48 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.28 2006/10/13 01:42:19 iliaa Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.29 2006/11/03 14:46:48 bjori Exp $ */ #include "php.h" #include "php_streams.h" @@ -4725,7 +4725,7 @@ 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 @@ 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) { http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.66.2.8.2.15&r2=1.66.2.8.2.16&diff_format=u Index: php-src/ext/tidy/tidy.c diff -u php-src/ext/tidy/tidy.c:1.66.2.8.2.15 php-src/ext/tidy/tidy.c:1.66.2.8.2.16 --- php-src/ext/tidy/tidy.c:1.66.2.8.2.15 Mon Oct 2 07:58:13 2006 +++ php-src/ext/tidy/tidy.c Fri Nov 3 14:46:48 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tidy.c,v 1.66.2.8.2.15 2006/10/02 07:58:13 bjori Exp $ */ +/* $Id: tidy.c,v 1.66.2.8.2.16 2006/11/03 14:46:48 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -988,7 +988,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Tidy support", "enabled"); php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate()); - php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.15 2006/10/02 07:58:13 bjori Exp $)"); + php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.16 2006/11/03 14:46:48 bjori Exp $)"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -1003,7 +1003,7 @@ TidyDoc doc; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &input, &input_len, &mode) == FAILURE) { - WRONG_PARAM_COUNT; + return; } doc = tidyCreate(); http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.5&r2=1.20.2.12.2.6&diff_format=u Index: php-src/ext/xmlwriter/php_xmlwriter.c diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.5 php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.6 --- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.5 Sat Sep 16 18:18:55 2006 +++ php-src/ext/xmlwriter/php_xmlwriter.c Fri Nov 3 14:46:48 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlwriter.c,v 1.20.2.12.2.5 2006/09/16 18:18:55 nlopess Exp $ */ +/* $Id: php_xmlwriter.c,v 1.20.2.12.2.6 2006/11/03 14:46:48 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1345,7 +1345,6 @@ #endif if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &source, &source_len) == FAILURE) { - WRONG_PARAM_COUNT; return; }