cvs: php-src /ext/dba dba.c /ext/mhash mhash.c /ext/session session.c /ext/shmop shmop.c /ext/standard basic_functions.c /ext/xmlwriter
php_xmlwriter.c /ext/zip php_zip.c

bjori Sat Oct 7 22:55:19 2006 UTC Modified files: /php-src/ext/session session.c /php-src/ext/mhash mhash.c /php-src/ext/dba dba.c /php-src/ext/shmop shmop.c /php-src/ext/standard basic_functions.c /php-src/ext/xmlwriter php_xmlwriter.c /php-src/ext/zip php_zip.c Log: Remove double "wrong param count" warnings

http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.453&r2=1.454&diff_format=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.453 php-src/ext/session/session.c:1.454 --- php-src/ext/session/session.c:1.453 Fri Oct 6 21:11:57 2006 +++ php-src/ext/session/session.c Sat Oct 7 22:55:18 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.453 2006/10/06 21:11:57 iliaa Exp $ */ +/* $Id: session.c,v 1.454 2006/10/07 22:55:18 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1416,7 +1416,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/mhash/mhash.c?r1=1.51&r2=1.52&diff_format=u Index: php-src/ext/mhash/mhash.c diff -u php-src/ext/mhash/mhash.c:1.51 php-src/ext/mhash/mhash.c:1.52 --- php-src/ext/mhash/mhash.c:1.51 Mon Apr 3 09:14:50 2006 +++ php-src/ext/mhash/mhash.c Sat Oct 7 22:55:18 2006 @@ -16,7 +16,7 @@ | Nikos Mavroyanopoulos <nmav@hellug.gr> (HMAC, KEYGEN) | +----------------------------------------------------------------------+ */ -/* $Id: mhash.c,v 1.51 2006/04/03 09:14:50 tony2001 Exp $ */ +/* $Id: mhash.c,v 1.52 2006/10/07 22:55:18 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/dba/dba.c?r1=1.121&r2=1.122&diff_format=u Index: php-src/ext/dba/dba.c diff -u php-src/ext/dba/dba.c:1.121 php-src/ext/dba/dba.c:1.122 --- php-src/ext/dba/dba.c:1.121 Thu Jul 6 23:13:41 2006 +++ php-src/ext/dba/dba.c Sat Oct 7 22:55:18 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.121 2006/07/06 23:13:41 iliaa Exp $ */ +/* $Id: dba.c,v 1.122 2006/10/07 22:55:18 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1160,7 +1160,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/shmop/shmop.c?r1=1.35&r2=1.36&diff_format=u Index: php-src/ext/shmop/shmop.c diff -u php-src/ext/shmop/shmop.c:1.35 php-src/ext/shmop/shmop.c:1.36 --- php-src/ext/shmop/shmop.c:1.35 Sat Oct 7 21:12:09 2006 +++ php-src/ext/shmop/shmop.c Sat Oct 7 22:55:18 2006 @@ -16,7 +16,7 @@ | Ilia Alshanetsky <ilia@prohost.org> | +----------------------------------------------------------------------+ */ -/* $Id: shmop.c,v 1.35 2006/10/07 21:12:09 bjori Exp $ */ +/* $Id: shmop.c,v 1.36 2006/10/07 22:55:18 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -122,7 +122,7 @@ zend_uchar flag_type; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ltll", &key, &flags, &flags_len, &flag_type, &mode, &size) == FAILURE) { - WRONG_PARAM_COUNT; + return; } if (flag_type == IS_UNICODE) { @@ -216,7 +216,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); @@ -256,7 +256,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); @@ -279,7 +279,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); @@ -305,7 +305,7 @@ int data_len; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lS|l", &shmid, &data, &data_len, &offset) == FAILURE) { - WRONG_PARAM_COUNT; + return; } shmop = zend_list_find(shmid, &type); @@ -341,7 +341,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.808&r2=1.809&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.808 php-src/ext/standard/basic_functions.c:1.809 --- php-src/ext/standard/basic_functions.c:1.808 Tue Oct 3 18:40:14 2006 +++ php-src/ext/standard/basic_functions.c Sat Oct 7 22:55:18 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.808 2006/10/03 18:40:14 tony2001 Exp $ */ +/* $Id: basic_functions.c,v 1.809 2006/10/07 22:55:18 bjori Exp $ */ #include "php.h" #include "php_streams.h" @@ -4702,8 +4702,8 @@ long tv_sec, tv_nsec; struct timespec php_req, php_rem; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &tv_sec, &tv_nsec)) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &tv_sec, &tv_nsec) == FAILURE) { + return; } php_req.tv_sec = (time_t) tv_sec; @@ -4731,8 +4731,8 @@ struct timeval tm; struct timespec php_req, php_rem; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &d_ts)) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &d_ts) == FAILURE) { + return; } if (gettimeofday((struct timeval *) &tm, NULL) != 0) { http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.38&r2=1.39&diff_format=u Index: php-src/ext/xmlwriter/php_xmlwriter.c diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.38 php-src/ext/xmlwriter/php_xmlwriter.c:1.39 --- php-src/ext/xmlwriter/php_xmlwriter.c:1.38 Sat Sep 16 18:21:53 2006 +++ php-src/ext/xmlwriter/php_xmlwriter.c Sat Oct 7 22:55:18 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlwriter.c,v 1.38 2006/09/16 18:21:53 nlopess Exp $ */ +/* $Id: php_xmlwriter.c,v 1.39 2006/10/07 22:55:18 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1365,7 +1365,6 @@ #endif if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t", &source, &source_len, &source_type) == FAILURE) { - WRONG_PARAM_COUNT; return; } http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.16&r2=1.17&diff_format=u Index: php-src/ext/zip/php_zip.c diff -u php-src/ext/zip/php_zip.c:1.16 php-src/ext/zip/php_zip.c:1.17 --- php-src/ext/zip/php_zip.c:1.16 Sun Sep 24 22:27:19 2006 +++ php-src/ext/zip/php_zip.c Sat Oct 7 22:55:18 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zip.c,v 1.16 2006/09/24 22:27:19 pajoye Exp $ */ +/* $Id: php_zip.c,v 1.17 2006/10/07 22:55:18 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -866,7 +866,6 @@ ze_zip_object *ze_obj = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &filename, &filename_len, &flags) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -955,7 +954,6 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|sll", &filename, &filename_len, &entry_name, &entry_name_len, &offset_start, &offset_len) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1022,7 +1020,6 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name, &name_len, &buffer, &buffer_len) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1086,7 +1083,6 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &name, &name_len, &flags) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1114,7 +1110,6 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &index, &flags) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1144,7 +1139,6 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &name, &name_len, &flags) == FAILURE) { - WRONG_PARAM_COUNT; return; } if (name_len<1) { @@ -1183,7 +1177,6 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &index, &flags) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1213,7 +1206,6 @@ ZIP_FROM_OBJECT(intern, this); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &comment, &comment_len) == FAILURE) { - WRONG_PARAM_COUNT; return; } if (zip_set_archive_comment(intern, (const char *)comment, (int)comment_len)) { @@ -1241,7 +1233,6 @@ ZIP_FROM_OBJECT(intern, this); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flags) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1268,7 +1259,6 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name, &name_len, &comment, &comment_len) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1297,7 +1287,6 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ls", &index, &comment, &comment_len) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1327,7 +1316,6 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &name, &name_len, &flags) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1356,7 +1344,6 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &index, &flags) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1381,7 +1368,6 @@ ZIP_FROM_OBJECT(intern, this); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &index) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1414,7 +1400,6 @@ ZIP_FROM_OBJECT(intern, this); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) { - WRONG_PARAM_COUNT; return; } if (name_len < 1) { @@ -1447,7 +1432,6 @@ ZIP_FROM_OBJECT(intern, this); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ls", &index, &new_name, &new_name_len) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1483,7 +1467,6 @@ ZIP_FROM_OBJECT(intern, this); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name, &name_len, &new_name, &new_name_len) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1516,7 +1499,6 @@ ZIP_FROM_OBJECT(intern, this); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &index) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1549,7 +1531,6 @@ ZIP_FROM_OBJECT(intern, this); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1636,7 +1617,6 @@ } if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z", &pathto, &pathto_len, &zval_files) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1732,13 +1712,11 @@ if (type == 1) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &filename, &filename_len, &len, &flags) == FAILURE) { - WRONG_PARAM_COUNT; return; } PHP_ZIP_STAT_PATH(intern, filename, filename_len, flags, sb); } else { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|ll", &index, &len, &flags) == FAILURE) { - WRONG_PARAM_COUNT; return; } PHP_ZIP_STAT_INDEX(intern, index, 0, sb); @@ -1809,7 +1787,6 @@ ZIP_FROM_OBJECT(intern, this); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &filename, &filename_len) == FAILURE) { - WRONG_PARAM_COUNT; return; } @@ -1959,7 +1936,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Zip", "enabled"); - php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.16 2006/09/24 22:27:19 pajoye Exp $"); + php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.17 2006/10/07 22:55:18 bjori Exp $"); php_info_print_table_row(2, "Zip version", "2.0.0"); php_info_print_table_row(2, "Libzip version", "0.7.1");