cvs: php4 /ext/mysql php_mysql.c

wez Wed May 9 15:28:16 2001 EDT Modified files: /php4/ext/mysql php_mysql.c Log: Reverse my earlier patch for mysql_db_query() & emit an E_NOTICE of it's deprecated status. # Should it be a warning or a notice? Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.84 php4/ext/mysql/php_mysql.c:1.85 --- php4/ext/mysql/php_mysql.c:1.84 Mon May 7 04:02:31 2001 +++ php4/ext/mysql/php_mysql.c Wed May 9 15:28:16 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.84 2001/05/07 11:02:31 wez Exp $ */ +/* $Id: php_mysql.c,v 1.85 2001/05/09 22:28:16 wez Exp $ */ /* TODO: @@ -1039,12 +1039,12 @@ /* }}} */ -/* {{{ proto int mysql_db_query(string database_name, string query [, int link_identifier] [, int result_mode]) +/* {{{ proto int mysql_db_query(string database_name, string query [, int link_identifier]) Send an SQL query to MySQL */ PHP_FUNCTION(mysql_db_query) { - zval **db, **query, **mysql_link, **resmode; - int id, use_store=MYSQL_STORE_RESULT; + zval **db, **query, **mysql_link; + int id; MySLS_FETCH(); switch(ZEND_NUM_ARGS()) { @@ -1061,21 +1061,14 @@ } id = -1; break; - case 4: - if (zend_get_parameters_ex(4, &db, &query, &mysql_link, &resmode)==FAILURE) { - RETURN_FALSE; - } - id = -1; - convert_to_long_ex(resmode); - use_store = Z_LVAL_PP(resmode); - break; - default: WRONG_PARAM_COUNT; break; } + + zend_error(E_NOTICE, "%s is deprecated; use mysql_select_db() and mysql_query() instead", get_active_function_name()); - php_mysql_do_query_general(query, mysql_link, id, db, use_store, return_value); + php_mysql_do_query_general(query, mysql_link, id, db, MYSQL_STORE_RESULT, return_value); } /* }}} */