diff options
| author | Sterling Hughes <sterling@php.net> | 2002-03-25 01:19:59 +0000 |
|---|---|---|
| committer | Sterling Hughes <sterling@php.net> | 2002-03-25 01:19:59 +0000 |
| commit | 7ae1dd662f26311ed75f35e575f7671274522214 (patch) | |
| tree | 1bd5d43841ec57fd8cd3ea76ceac38cec61a18e0 /ext/mysql/php_mysql.c | |
| parent | 3c3ae850a29673b44ea14f82b2f50f990ede73dc (diff) | |
| download | php-git-7ae1dd662f26311ed75f35e575f7671274522214.tar.gz | |
more zend_parse_parameters fixup
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index d003595b11..bd664d9fce 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -917,21 +917,14 @@ PHP_FUNCTION(mysql_thread_id) int id = -1; php_mysql_conn *mysql; - switch(ZEND_NUM_ARGS()) { - case 0: - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); - break; - case 1: - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &mysql_link)==FAILURE) { - RETURN_FALSE; - } - break; - default: - WRONG_PARAM_COUNT; - break; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + return; } + if (ZEND_NUM_ARGS() == 0) { + id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(id); + } ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); RETURN_LONG(mysql_thread_id(&mysql->conn)); @@ -946,21 +939,14 @@ PHP_FUNCTION(mysql_stat) int id = -1; php_mysql_conn *mysql; - switch(ZEND_NUM_ARGS()) { - case 0: - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); - break; - case 1: - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &mysql_link)==FAILURE) { - RETURN_FALSE; - } - break; - default: - WRONG_PARAM_COUNT; - break; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + return; } + if (ZEND_NUM_ARGS() == 0) { + id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(id); + } ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); RETURN_STRING(mysql_stat(&mysql->conn), 1); |