cvs: php4 /ext/mysql php_mysql.c

zak Sun Mar 24 18:33:08 2002 EDT Modified files: /php4/ext/mysql php_mysql.c Log: Added mysql_table_name() alias for mysql_tablename() Improved logic of parameter parsing code for mysql_ping - made test for no arguments more explicit - combined to if blocks into one if/else if block Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.125 php4/ext/mysql/php_mysql.c:1.126 --- php4/ext/mysql/php_mysql.c:1.125 Sun Mar 24 13:19:31 2002 +++ php4/ext/mysql/php_mysql.c Sun Mar 24 18:33:07 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.125 2002/03/24 18:19:31 sander Exp $ */ +/* $Id: php_mysql.c,v 1.126 2002/03/24 23:33:07 zak Exp $ */ /* TODO: @@ -188,6 +188,7 @@ PHP_FALIAS(mysql_db_name, mysql_result, NULL) PHP_FALIAS(mysql_dbname, mysql_result, NULL) PHP_FALIAS(mysql_tablename, mysql_result, NULL) + PHP_FALIAS(mysql_table_name, mysql_result, NULL) {NULL, NULL, NULL} }; /* }}} */ @@ -2246,13 +2247,11 @@ int id = -1; php_mysql_conn *mysql; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link)==FAILURE) { - return; - } - - if (! ZEND_NUM_ARGS()) { + if (0 == ZEND_NUM_ARGS()) { id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); CHECK_LINK(id); + } else if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &mysql_link)==FAILURE) { + return; } ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink);