felipe Thu Jan 8 00:12:19 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mssql php_mssql.c
Log:
- MFH: Removed WRONG_PARAM_COUNT usage
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.13.2.4.2.19&r2=1.152.2.13.2.4.2.20&diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.19
php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.20
--- php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.19 Wed Dec 31 11:15:38 2008
+++ php-src/ext/mssql/php_mssql.c Thu Jan 8 00:12:19 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.19 2008/12/31 11:15:38 sebastian Exp $
*/
+/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.20 2009/01/08 00:12:19 felipe Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -851,24 +851,18 @@
PHP_FUNCTION(mssql_close)
{
zval *mssql_link_index = NULL;
- int id;
+ int id = -1;
mssql_link *mssql_ptr;
- switch (ZEND_NUM_ARGS()) {
- case 0:
- id =
php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
- CHECK_LINK(id);
- break;
- case 1:
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"r", &mssql_link_index) == FAILURE) {
- return;
- }
- id = -1;
- break;
- default:
- WRONG_PARAM_COUNT;
- break;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r",
&mssql_link_index) == FAILURE) {
+ return;
}
+
+ if (mssql_link_index == NULL) {
+ id =
php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+ CHECK_LINK(id);
+ }
+
ZEND_FETCH_RESOURCE2(mssql_ptr, mssql_link *, &mssql_link_index, id,
"MS SQL-Link", le_link, le_plink);
if (mssql_link_index) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
