diff options
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/mysqli.c | 48 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 235 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 79 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_report.c | 3 |
4 files changed, 122 insertions, 243 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index ec7d296b24..f832352edb 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -192,8 +192,7 @@ void php_clear_mysql(MY_MYSQL *mysql) { } /* }}} */ -/* {{{ mysqli_objects_free_storage - */ +/* {{{ mysqli_objects_free_storage */ static void mysqli_objects_free_storage(zend_object *object) { mysqli_object *intern = php_mysqli_fetch_object(object); @@ -208,8 +207,7 @@ static void mysqli_objects_free_storage(zend_object *object) /* mysqli_link_free_storage partly doubles the work of PHP_FUNCTION(mysqli_close) */ -/* {{{ mysqli_link_free_storage - */ +/* {{{ mysqli_link_free_storage */ static void mysqli_link_free_storage(zend_object *object) { mysqli_object *intern = php_mysqli_fetch_object(object); @@ -235,8 +233,7 @@ static void mysqli_driver_free_storage(zend_object *object) } /* }}} */ -/* {{{ mysqli_stmt_free_storage - */ +/* {{{ mysqli_stmt_free_storage */ static void mysqli_stmt_free_storage(zend_object *object) { mysqli_object *intern = php_mysqli_fetch_object(object); @@ -250,8 +247,7 @@ static void mysqli_stmt_free_storage(zend_object *object) } /* }}} */ -/* {{{ mysqli_result_free_storage - */ +/* {{{ mysqli_result_free_storage */ static void mysqli_result_free_storage(zend_object *object) { mysqli_object *intern = php_mysqli_fetch_object(object); @@ -264,8 +260,7 @@ static void mysqli_result_free_storage(zend_object *object) } /* }}} */ -/* {{{ mysqli_warning_free_storage - */ +/* {{{ mysqli_warning_free_storage */ static void mysqli_warning_free_storage(zend_object *object) { mysqli_object *intern = php_mysqli_fetch_object(object); @@ -421,8 +416,7 @@ HashTable *mysqli_object_get_debug_info(zend_object *object, int *is_temp) return retval; } -/* {{{ mysqli_objects_new - */ +/* {{{ mysqli_objects_new */ PHP_MYSQLI_EXPORT(zend_object *) mysqli_objects_new(zend_class_entry *class_type) { mysqli_object *intern; @@ -487,8 +481,7 @@ static const MYSQLND_REVERSE_API mysqli_reverse_api = { }; #endif -/* {{{ PHP_INI_BEGIN -*/ +/* {{{ PHP_INI_BEGIN */ PHP_INI_BEGIN() STD_PHP_INI_ENTRY_EX("mysqli.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_links, zend_mysqli_globals, mysqli_globals, display_link_numbers) STD_PHP_INI_ENTRY_EX("mysqli.max_persistent", "-1", PHP_INI_SYSTEM, OnUpdateLong, max_persistent, zend_mysqli_globals, mysqli_globals, display_link_numbers) @@ -508,8 +501,7 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* {{{ PHP_GINIT_FUNCTION - */ +/* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(mysqli) { #if defined(COMPILE_DL_MYSQLI) && defined(ZTS) @@ -535,8 +527,7 @@ static PHP_GINIT_FUNCTION(mysqli) } /* }}} */ -/* {{{ PHP_MINIT_FUNCTION - */ +/* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(mysqli) { zend_class_entry *ce,cex; @@ -840,8 +831,7 @@ PHP_MINIT_FUNCTION(mysqli) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(mysqli) { #ifndef MYSQLI_USE_MYSQLND @@ -871,8 +861,7 @@ PHP_MSHUTDOWN_FUNCTION(mysqli) } /* }}} */ -/* {{{ PHP_RINIT_FUNCTION - */ +/* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(mysqli) { #if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS) @@ -906,8 +895,7 @@ static int php_mysqli_persistent_helper_once(zend_rsrc_list_entry *le) #endif -/* {{{ PHP_RSHUTDOWN_FUNCTION - */ +/* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(mysqli) { /* check persistent connections, move used to free */ @@ -927,8 +915,7 @@ PHP_RSHUTDOWN_FUNCTION(mysqli) /* }}} */ -/* {{{ PHP_MINFO_FUNCTION - */ +/* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(mysqli) { char buf[32]; @@ -962,8 +949,7 @@ static const zend_module_dep mysqli_deps[] = { ZEND_MOD_END }; -/* {{{ mysqli_module_entry - */ +/* {{{ mysqli_module_entry */ zend_module_entry mysqli_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, mysqli_deps, @@ -1096,8 +1082,7 @@ PHP_METHOD(mysqli_result, getIterator) zend_create_internal_iterator_zval(return_value, ZEND_THIS); } -/* {{{ php_mysqli_fetch_into_hash_aux - */ +/* {{{ php_mysqli_fetch_into_hash_aux */ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend_long fetchtype) { #ifndef MYSQLI_USE_MYSQLND @@ -1169,8 +1154,7 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend } /* }}} */ -/* {{{ php_mysqli_fetch_into_hash - */ +/* {{{ php_mysqli_fetch_into_hash */ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags, int into_object) { MYSQL_RES *result; diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 0a360d6a6e..8dbbd45c8e 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -133,8 +133,7 @@ static int mysqli_commit_or_rollback_libmysql(MYSQL * conn, zend_bool commit, co /* }}} */ #endif -/* {{{ proto mixed mysqli_affected_rows(object link) - Get number of affected rows in previous MySQL operation */ +/* {{{ Get number of affected rows in previous MySQL operation */ PHP_FUNCTION(mysqli_affected_rows) { MY_MYSQL *mysql; @@ -155,8 +154,7 @@ PHP_FUNCTION(mysqli_affected_rows) } /* }}} */ -/* {{{ proto bool mysqli_autocommit(object link, bool mode) - Turn auto commit on or of */ +/* {{{ Turn auto commit on or of */ PHP_FUNCTION(mysqli_autocommit) { MY_MYSQL *mysql; @@ -311,8 +309,7 @@ end: #endif /* }}} */ -/* {{{ proto bool mysqli_stmt_bind_param(object stmt, string types, mixed variable [,mixed ...]) - Bind variables to a prepared statement as parameters */ +/* {{{ Bind variables to a prepared statement as parameters */ PHP_FUNCTION(mysqli_stmt_bind_param) { zval *args; @@ -574,8 +571,7 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval *args, unsigned int argc) #endif /* }}} */ -/* {{{ proto bool mysqli_stmt_bind_result(object stmt, mixed var [,mixed ...]) - Bind variables to a prepared statement for result storage */ +/* {{{ Bind variables to a prepared statement for result storage */ PHP_FUNCTION(mysqli_stmt_bind_result) { zval *args; @@ -600,8 +596,7 @@ PHP_FUNCTION(mysqli_stmt_bind_result) } /* }}} */ -/* {{{ proto bool mysqli_change_user(object link, string user, string password, string database) - Change logged-in user of the active connection */ +/* {{{ Change logged-in user of the active connection */ PHP_FUNCTION(mysqli_change_user) { MY_MYSQL *mysql; @@ -647,8 +642,7 @@ PHP_FUNCTION(mysqli_change_user) } /* }}} */ -/* {{{ proto string mysqli_character_set_name(object link) - Returns the name of the character set used for this connection */ +/* {{{ Returns the name of the character set used for this connection */ PHP_FUNCTION(mysqli_character_set_name) { MY_MYSQL *mysql; @@ -708,8 +702,7 @@ void php_mysqli_close(MY_MYSQL * mysql, int close_type, int resource_status) } /* }}} */ -/* {{{ proto bool mysqli_close(object link) - Close connection */ +/* {{{ Close connection */ PHP_FUNCTION(mysqli_close) { zval *mysql_link; @@ -730,8 +723,7 @@ PHP_FUNCTION(mysqli_close) } /* }}} */ -/* {{{ proto bool mysqli_commit(object link[, int flags [, string name ]]) - Commit outstanding actions and close transaction */ +/* {{{ Commit outstanding actions and close transaction */ PHP_FUNCTION(mysqli_commit) { MY_MYSQL *mysql; @@ -756,8 +748,7 @@ PHP_FUNCTION(mysqli_commit) } /* }}} */ -/* {{{ proto bool mysqli_data_seek(object result, int offset) - Move internal result pointer */ +/* {{{ Move internal result pointer */ PHP_FUNCTION(mysqli_data_seek) { MYSQL_RES *result; @@ -784,8 +775,7 @@ PHP_FUNCTION(mysqli_data_seek) } /* }}} */ -/* {{{ proto bool mysqli_debug(string debug) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_debug) { char *debug; @@ -800,8 +790,7 @@ PHP_FUNCTION(mysqli_debug) } /* }}} */ -/* {{{ proto bool mysqli_dump_debug_info(object link) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_dump_debug_info) { MY_MYSQL *mysql; @@ -816,8 +805,7 @@ PHP_FUNCTION(mysqli_dump_debug_info) } /* }}} */ -/* {{{ proto int mysqli_errno(object link) - Returns the numerical value of the error message from previous MySQL operation */ +/* {{{ Returns the numerical value of the error message from previous MySQL operation */ PHP_FUNCTION(mysqli_errno) { MY_MYSQL *mysql; @@ -831,8 +819,7 @@ PHP_FUNCTION(mysqli_errno) } /* }}} */ -/* {{{ proto string mysqli_error(object link) - Returns the text of the error message from previous MySQL operation */ +/* {{{ Returns the text of the error message from previous MySQL operation */ PHP_FUNCTION(mysqli_error) { MY_MYSQL *mysql; @@ -850,8 +837,7 @@ PHP_FUNCTION(mysqli_error) } /* }}} */ -/* {{{ proto bool mysqli_stmt_execute(object stmt) - Execute a prepared statement */ +/* {{{ Execute a prepared statement */ PHP_FUNCTION(mysqli_stmt_execute) { MY_STMT *stmt; @@ -1121,8 +1107,7 @@ void mysqli_stmt_fetch_mysqlnd(INTERNAL_FUNCTION_PARAMETERS) #endif /* }}} */ -/* {{{ proto mixed mysqli_stmt_fetch(object stmt) - Fetch results from a prepared statement into the bound variables */ +/* {{{ Fetch results from a prepared statement into the bound variables */ PHP_FUNCTION(mysqli_stmt_fetch) { #ifndef MYSQLI_USE_MYSQLND @@ -1163,8 +1148,7 @@ static void php_add_field_properties(zval *value, const MYSQL_FIELD *field) } /* }}} */ -/* {{{ proto mixed mysqli_fetch_field(object result) - Get column information from a result and return as an object */ +/* {{{ Get column information from a result and return as an object */ PHP_FUNCTION(mysqli_fetch_field) { MYSQL_RES *result; @@ -1186,8 +1170,7 @@ PHP_FUNCTION(mysqli_fetch_field) } /* }}} */ -/* {{{ proto mixed mysqli_fetch_fields(object result) - Return array of objects containing field meta-data */ +/* {{{ Return array of objects containing field meta-data */ PHP_FUNCTION(mysqli_fetch_fields) { MYSQL_RES *result; @@ -1216,8 +1199,7 @@ PHP_FUNCTION(mysqli_fetch_fields) } /* }}} */ -/* {{{ proto mixed mysqli_fetch_field_direct(object result, int offset) - Fetch meta-data for a single field */ +/* {{{ Fetch meta-data for a single field */ PHP_FUNCTION(mysqli_fetch_field_direct) { MYSQL_RES *result; @@ -1245,8 +1227,7 @@ PHP_FUNCTION(mysqli_fetch_field_direct) } /* }}} */ -/* {{{ proto mixed mysqli_fetch_lengths(object result) - Get the length of each output in a result */ +/* {{{ Get the length of each output in a result */ PHP_FUNCTION(mysqli_fetch_lengths) { MYSQL_RES *result; @@ -1277,17 +1258,14 @@ PHP_FUNCTION(mysqli_fetch_lengths) } /* }}} */ -/* {{{ proto array mysqli_fetch_row(object result) - Get a result row as an enumerated array */ +/* {{{ Get a result row as an enumerated array */ PHP_FUNCTION(mysqli_fetch_row) { php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_NUM, 0); } /* }}} */ -/* {{{ proto int mysqli_field_count(object link) - Fetch the number of fields returned by the last query for the given link -*/ +/* {{{ Fetch the number of fields returned by the last query for the given link */ PHP_FUNCTION(mysqli_field_count) { MY_MYSQL *mysql; @@ -1302,9 +1280,7 @@ PHP_FUNCTION(mysqli_field_count) } /* }}} */ -/* {{{ proto int mysqli_field_seek(object result, int fieldnr) - Set result pointer to a specified field offset -*/ +/* {{{ Set result pointer to a specified field offset */ PHP_FUNCTION(mysqli_field_seek) { MYSQL_RES *result; @@ -1326,8 +1302,7 @@ PHP_FUNCTION(mysqli_field_seek) } /* }}} */ -/* {{{ proto int mysqli_field_tell(object result) - Get current field offset of result pointer */ +/* {{{ Get current field offset of result pointer */ PHP_FUNCTION(mysqli_field_tell) { MYSQL_RES *result; @@ -1342,8 +1317,7 @@ PHP_FUNCTION(mysqli_field_tell) } /* }}} */ -/* {{{ proto void mysqli_free_result(object result) - Free query result memory for the given result handle */ +/* {{{ Free query result memory for the given result handle */ PHP_FUNCTION(mysqli_free_result) { MYSQL_RES *result; @@ -1359,8 +1333,7 @@ PHP_FUNCTION(mysqli_free_result) } /* }}} */ -/* {{{ proto string mysqli_get_client_info(void) - Get MySQL client info */ +/* {{{ Get MySQL client info */ PHP_FUNCTION(mysqli_get_client_info) { if (getThis()) { @@ -1382,8 +1355,7 @@ PHP_FUNCTION(mysqli_get_client_info) } /* }}} */ -/* {{{ proto int mysqli_get_client_version(void) - Get MySQL client info */ +/* {{{ Get MySQL client info */ PHP_FUNCTION(mysqli_get_client_version) { if (zend_parse_parameters_none() == FAILURE) { @@ -1394,8 +1366,7 @@ PHP_FUNCTION(mysqli_get_client_version) } /* }}} */ -/* {{{ proto string mysqli_get_host_info(object link) - Get MySQL host info */ +/* {{{ Get MySQL host info */ PHP_FUNCTION(mysqli_get_host_info) { MY_MYSQL *mysql; @@ -1413,8 +1384,7 @@ PHP_FUNCTION(mysqli_get_host_info) } /* }}} */ -/* {{{ proto int mysqli_get_proto_info(object link) - Get MySQL protocol information */ +/* {{{ Get MySQL protocol information */ PHP_FUNCTION(mysqli_get_proto_info) { MY_MYSQL *mysql; @@ -1428,8 +1398,7 @@ PHP_FUNCTION(mysqli_get_proto_info) } /* }}} */ -/* {{{ proto string mysqli_get_server_info(object link) - Get MySQL server info */ +/* {{{ Get MySQL server info */ PHP_FUNCTION(mysqli_get_server_info) { MY_MYSQL *mysql; @@ -1448,8 +1417,7 @@ PHP_FUNCTION(mysqli_get_server_info) } /* }}} */ -/* {{{ proto int mysqli_get_server_version(object link) - Return the MySQL version for the server referenced by the given link */ +/* {{{ Return the MySQL version for the server referenced by the given link */ PHP_FUNCTION(mysqli_get_server_version) { MY_MYSQL *mysql; @@ -1464,8 +1432,7 @@ PHP_FUNCTION(mysqli_get_server_version) } /* }}} */ -/* {{{ proto string mysqli_info(object link) - Get information about the most recent query */ +/* {{{ Get information about the most recent query */ PHP_FUNCTION(mysqli_info) { MY_MYSQL *mysql; @@ -1526,24 +1493,21 @@ void php_mysqli_init(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_method) } /* }}} */ -/* {{{ proto resource mysqli_init(void) - Initialize mysqli and return a resource for use with mysql_real_connect */ +/* {{{ Initialize mysqli and return a resource for use with mysql_real_connect */ PHP_FUNCTION(mysqli_init) { php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE); } /* }}} */ -/* {{{ proto resource mysqli::init(void) - Initialize mysqli and return a resource for use with mysql_real_connect */ +/* {{{ Initialize mysqli and return a resource for use with mysql_real_connect */ PHP_FUNCTION(mysqli_init_method) { php_mysqli_init(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE); } /* }}} */ -/* {{{ proto mixed mysqli_insert_id(object link) - Get the ID generated from the previous INSERT operation */ +/* {{{ Get the ID generated from the previous INSERT operation */ PHP_FUNCTION(mysqli_insert_id) { MY_MYSQL *mysql; @@ -1559,8 +1523,7 @@ PHP_FUNCTION(mysqli_insert_id) } /* }}} */ -/* {{{ proto bool mysqli_kill(object link, int processid) - Kill a mysql process on the server */ +/* {{{ Kill a mysql process on the server */ PHP_FUNCTION(mysqli_kill) { MY_MYSQL *mysql; @@ -1585,8 +1548,7 @@ PHP_FUNCTION(mysqli_kill) } /* }}} */ -/* {{{ proto bool mysqli_more_results(object link) - check if there any more query results from a multi query */ +/* {{{ check if there any more query results from a multi query */ PHP_FUNCTION(mysqli_more_results) { MY_MYSQL *mysql; @@ -1601,8 +1563,7 @@ PHP_FUNCTION(mysqli_more_results) } /* }}} */ -/* {{{ proto bool mysqli_next_result(object link) - read next result from multi_query */ +/* {{{ read next result from multi_query */ PHP_FUNCTION(mysqli_next_result) { MY_MYSQL *mysql; zval *mysql_link; @@ -1617,8 +1578,7 @@ PHP_FUNCTION(mysqli_next_result) { /* }}} */ #if defined(HAVE_STMT_NEXT_RESULT) && defined(MYSQLI_USE_MYSQLND) -/* {{{ proto bool mysqli_stmt_more_results(object link) - check if there any more query results from a multi query */ +/* {{{ check if there any more query results from a multi query */ PHP_FUNCTION(mysqli_stmt_more_results) { MY_STMT *stmt; @@ -1633,8 +1593,7 @@ PHP_FUNCTION(mysqli_stmt_more_results) } /* }}} */ -/* {{{ proto bool mysqli_stmt_next_result(object link) - read next result from multi_query */ +/* {{{ read next result from multi_query */ PHP_FUNCTION(mysqli_stmt_next_result) { MY_STMT *stmt; zval *mysql_stmt; @@ -1649,8 +1608,7 @@ PHP_FUNCTION(mysqli_stmt_next_result) { /* }}} */ #endif -/* {{{ proto int mysqli_num_fields(object result) - Get number of fields in result */ +/* {{{ Get number of fields in result */ PHP_FUNCTION(mysqli_num_fields) { MYSQL_RES *result; @@ -1665,8 +1623,7 @@ PHP_FUNCTION(mysqli_num_fields) } /* }}} */ -/* {{{ proto mixed mysqli_num_rows(object result) - Get number of rows in result */ +/* {{{ Get number of rows in result */ PHP_FUNCTION(mysqli_num_rows) { MYSQL_RES *result; @@ -1751,8 +1708,7 @@ static int mysqli_options_get_option_zval_type(int option) } /* }}} */ -/* {{{ proto bool mysqli_options(object link, int flags, mixed values) - Set options */ +/* {{{ Set options */ PHP_FUNCTION(mysqli_options) { MY_MYSQL *mysql; @@ -1807,8 +1763,7 @@ PHP_FUNCTION(mysqli_options) } /* }}} */ -/* {{{ proto bool mysqli_ping(object link) - Ping a server connection or reconnect if there is no connection */ +/* {{{ Ping a server connection or reconnect if there is no connection */ PHP_FUNCTION(mysqli_ping) { MY_MYSQL *mysql; @@ -1826,8 +1781,7 @@ PHP_FUNCTION(mysqli_ping) } /* }}} */ -/* {{{ proto mixed mysqli_prepare(object link, string query) - Prepare a SQL statement for execution */ +/* {{{ Prepare a SQL statement for execution */ PHP_FUNCTION(mysqli_prepare) { MY_MYSQL *mysql; @@ -1910,16 +1864,14 @@ PHP_FUNCTION(mysqli_prepare) } /* }}} */ -/* {{{ proto bool mysqli_real_connect(object link [,string hostname [,string username [,string passwd [,string dbname [,int port [,string socket [,int flags]]]]]]]) - Open a connection to a mysql server */ +/* {{{ Open a connection to a mysql server */ PHP_FUNCTION(mysqli_real_connect) { mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE, FALSE); } /* }}} */ -/* {{{ proto bool mysqli_real_query(object link, string query) - Binary-safe version of mysql_query() */ +/* {{{ Binary-safe version of mysql_query() */ PHP_FUNCTION(mysqli_real_query) { MY_MYSQL *mysql; @@ -1949,8 +1901,7 @@ PHP_FUNCTION(mysqli_real_query) } /* }}} */ -/* {{{ proto string mysqli_real_escape_string(object link, string escapestr) - Escapes special characters in a string for use in a SQL statement, taking into account the current charset of the connection */ +/* {{{ Escapes special characters in a string for use in a SQL statement, taking into account the current charset of the connection */ PHP_FUNCTION(mysqli_real_escape_string) { MY_MYSQL *mysql; zval *mysql_link = NULL; @@ -1971,8 +1922,7 @@ PHP_FUNCTION(mysqli_real_escape_string) { } /* }}} */ -/* {{{ proto bool mysqli_rollback(object link) - Undo actions from current transaction */ +/* {{{ Undo actions from current transaction */ PHP_FUNCTION(mysqli_rollback) { MY_MYSQL *mysql; @@ -1997,8 +1947,7 @@ PHP_FUNCTION(mysqli_rollback) } /* }}} */ -/* {{{ proto bool mysqli_stmt_send_long_data(object stmt, int param_nr, string data) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_send_long_data) { MY_STMT *stmt; @@ -2023,8 +1972,7 @@ PHP_FUNCTION(mysqli_stmt_send_long_data) } /* }}} */ -/* {{{ proto string|int|false mysqli_stmt_affected_rows(object stmt) - Return the number of rows affected in the last query for the given link. */ +/* {{{ Return the number of rows affected in the last query for the given link. */ PHP_FUNCTION(mysqli_stmt_affected_rows) { MY_STMT *stmt; @@ -2044,8 +1992,7 @@ PHP_FUNCTION(mysqli_stmt_affected_rows) } /* }}} */ -/* {{{ proto bool mysqli_stmt_close(object stmt) - Close statement */ +/* {{{ Close statement */ PHP_FUNCTION(mysqli_stmt_close) { MY_STMT *stmt; @@ -2064,8 +2011,7 @@ PHP_FUNCTION(mysqli_stmt_close) } /* }}} */ -/* {{{ proto void mysqli_stmt_data_seek(object stmt, int offset) - Move internal result pointer */ +/* {{{ Move internal result pointer */ PHP_FUNCTION(mysqli_stmt_data_seek) { MY_STMT *stmt; @@ -2086,8 +2032,7 @@ PHP_FUNCTION(mysqli_stmt_data_seek) } /* }}} */ -/* {{{ proto int mysqli_stmt_field_count(object stmt) { - Return the number of result columns for the given statement */ +/* {{{ Return the number of result columns for the given statement */ PHP_FUNCTION(mysqli_stmt_field_count) { MY_STMT *stmt; @@ -2102,8 +2047,7 @@ PHP_FUNCTION(mysqli_stmt_field_count) } /* }}} */ -/* {{{ proto void mysqli_stmt_free_result(object stmt) - Free stored result memory for the given statement handle */ +/* {{{ Free stored result memory for the given statement handle */ PHP_FUNCTION(mysqli_stmt_free_result) { MY_STMT *stmt; @@ -2119,8 +2063,7 @@ PHP_FUNCTION(mysqli_stmt_free_result) } /* }}} */ -/* {{{ proto mixed mysqli_stmt_insert_id(object stmt) - Get the ID generated from the previous INSERT operation */ +/* {{{ Get the ID generated from the previous INSERT operation */ PHP_FUNCTION(mysqli_stmt_insert_id) { MY_STMT *stmt; @@ -2136,8 +2079,7 @@ PHP_FUNCTION(mysqli_stmt_insert_id) } /* }}} */ -/* {{{ proto int mysqli_stmt_param_count(object stmt) - Return the number of parameter for the given statement */ +/* {{{ Return the number of parameter for the given statement */ PHP_FUNCTION(mysqli_stmt_param_count) { MY_STMT *stmt; @@ -2152,8 +2094,7 @@ PHP_FUNCTION(mysqli_stmt_param_count) } /* }}} */ -/* {{{ proto bool mysqli_stmt_reset(object stmt) - reset a prepared statement */ +/* {{{ reset a prepared statement */ PHP_FUNCTION(mysqli_stmt_reset) { MY_STMT *stmt; @@ -2172,8 +2113,7 @@ PHP_FUNCTION(mysqli_stmt_reset) } /* }}} */ -/* {{{ proto mixed mysqli_stmt_num_rows(object stmt) - Return the number of rows in statements result set */ +/* {{{ Return the number of rows in statements result set */ PHP_FUNCTION(mysqli_stmt_num_rows) { MY_STMT *stmt; @@ -2191,8 +2131,7 @@ PHP_FUNCTION(mysqli_stmt_num_rows) } /* }}} */ -/* {{{ proto bool mysqli_select_db(object link, string dbname) - Select a MySQL database */ +/* {{{ Select a MySQL database */ PHP_FUNCTION(mysqli_select_db) { MY_MYSQL *mysql; @@ -2213,8 +2152,7 @@ PHP_FUNCTION(mysqli_select_db) } /* }}} */ -/* {{{ proto string mysqli_sqlstate(object link) - Returns the SQLSTATE error from previous MySQL operation */ +/* {{{ Returns the SQLSTATE error from previous MySQL operation */ PHP_FUNCTION(mysqli_sqlstate) { MY_MYSQL *mysql; @@ -2232,8 +2170,7 @@ PHP_FUNCTION(mysqli_sqlstate) } /* }}} */ -/* {{{ proto bool mysqli_ssl_set(object link ,string key ,string cert ,string ca ,string capath ,string cipher]) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_ssl_set) { MY_MYSQL *mysql; @@ -2258,8 +2195,7 @@ PHP_FUNCTION(mysqli_ssl_set) } /* }}} */ -/* {{{ proto mixed mysqli_stat(object link) - Get current system status */ +/* {{{ Get current system status */ PHP_FUNCTION(mysqli_stat) { MY_MYSQL *mysql; @@ -2291,8 +2227,7 @@ PHP_FUNCTION(mysqli_stat) /* }}} */ -/* {{{ proto bool mysqli_refresh(object link, int options) - Flush tables or caches, or reset replication server information */ +/* {{{ Flush tables or caches, or reset replication server information */ PHP_FUNCTION(mysqli_refresh) { MY_MYSQL *mysql; @@ -2311,8 +2246,7 @@ PHP_FUNCTION(mysqli_refresh) } /* }}} */ -/* {{{ proto int mysqli_stmt_attr_set(object stmt, int attr, int mode) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_attr_set) { MY_STMT *stmt; @@ -2358,8 +2292,7 @@ PHP_FUNCTION(mysqli_stmt_attr_set) } /* }}} */ -/* {{{ proto int mysqli_stmt_attr_get(object stmt, int attr) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_attr_get) { MY_STMT *stmt; @@ -2385,8 +2318,7 @@ PHP_FUNCTION(mysqli_stmt_attr_get) } /* }}} */ -/* {{{ proto int mysqli_stmt_errno(object stmt) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_errno) { MY_STMT *stmt; @@ -2401,8 +2333,7 @@ PHP_FUNCTION(mysqli_stmt_errno) } /* }}} */ -/* {{{ proto string mysqli_stmt_error(object stmt) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_error) { MY_STMT *stmt; @@ -2421,9 +2352,7 @@ PHP_FUNCTION(mysqli_stmt_error) } /* }}} */ -/* {{{ proto mixed mysqli_stmt_init(object link) - Initialize statement object -*/ +/* {{{ Initialize statement object */ PHP_FUNCTION(mysqli_stmt_init) { MY_MYSQL *mysql; @@ -2453,9 +2382,7 @@ PHP_FUNCTION(mysqli_stmt_init) } /* }}} */ -/* {{{ proto bool mysqli_stmt_prepare(object stmt, string query) - prepare server side statement with query -*/ +/* {{{ prepare server side statement with query */ PHP_FUNCTION(mysqli_stmt_prepare) { MY_STMT *stmt; @@ -2478,8 +2405,7 @@ PHP_FUNCTION(mysqli_stmt_prepare) } /* }}} */ -/* {{{ proto mixed mysqli_stmt_result_metadata(object stmt) - return result set from statement */ +/* {{{ return result set from statement */ PHP_FUNCTION(mysqli_stmt_result_metadata) { MY_STMT *stmt; @@ -2504,8 +2430,7 @@ PHP_FUNCTION(mysqli_stmt_result_metadata) } /* }}} */ -/* {{{ proto bool mysqli_stmt_store_result(object stmt) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_store_result) { MY_STMT *stmt; @@ -2553,8 +2478,7 @@ PHP_FUNCTION(mysqli_stmt_store_result) } /* }}} */ -/* {{{ proto string mysqli_stmt_sqlstate(object stmt) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_sqlstate) { MY_STMT *stmt; @@ -2573,8 +2497,7 @@ PHP_FUNCTION(mysqli_stmt_sqlstate) } /* }}} */ -/* {{{ proto object mysqli_store_result(object link [, int flags]) - Buffer result set on client */ +/* {{{ Buffer result set on client */ PHP_FUNCTION(mysqli_store_result) { MY_MYSQL *mysql; @@ -2608,8 +2531,7 @@ PHP_FUNCTION(mysqli_store_result) } /* }}} */ -/* {{{ proto int mysqli_thread_id(object link) - Return the current thread ID */ +/* {{{ Return the current thread ID */ PHP_FUNCTION(mysqli_thread_id) { MY_MYSQL *mysql; @@ -2624,8 +2546,7 @@ PHP_FUNCTION(mysqli_thread_id) } /* }}} */ -/* {{{ proto bool mysqli_thread_safe(void) - Return whether thread safety is given or not */ +/* {{{ Return whether thread safety is given or not */ PHP_FUNCTION(mysqli_thread_safe) { if (zend_parse_parameters_none() == FAILURE) { @@ -2636,8 +2557,7 @@ PHP_FUNCTION(mysqli_thread_safe) } /* }}} */ -/* {{{ proto mixed mysqli_use_result(object link) - Directly retrieve query results - do not buffer results on client side */ +/* {{{ Directly retrieve query results - do not buffer results on client side */ PHP_FUNCTION(mysqli_use_result) { MY_MYSQL *mysql; @@ -2665,8 +2585,7 @@ PHP_FUNCTION(mysqli_use_result) } /* }}} */ -/* {{{ proto int mysqli_warning_count(object link) - Return number of warnings from the last query for the given link */ +/* {{{ Return number of warnings from the last query for the given link */ PHP_FUNCTION(mysqli_warning_count) { MY_MYSQL *mysql; diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 5f3114e9df..ba97e0aa24 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -31,8 +31,7 @@ #define SAFE_STR(a) ((a)?a:"") -/* {{{ php_mysqli_set_error - */ +/* {{{ php_mysqli_set_error */ static void php_mysqli_set_error(zend_long mysql_errno, char *mysql_err) { MyG(error_no) = mysql_errno; @@ -370,24 +369,21 @@ err: RETVAL_FALSE; } /* }}} */ -/* {{{ proto object mysqli_connect([string hostname [,string username [,string passwd [,string dbname [,int port [,string socket]]]]]]) - Open a connection to a mysql server */ +/* {{{ Open a connection to a mysql server */ PHP_FUNCTION(mysqli_connect) { mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, FALSE); } /* }}} */ -/* {{{ proto object mysqli_link_construct() - */ +/* {{{ */ PHP_FUNCTION(mysqli_link_construct) { mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, TRUE); } /* }}} */ -/* {{{ proto int mysqli_connect_errno(void) - Returns the numerical value of the error message from last connect command */ +/* {{{ Returns the numerical value of the error message from last connect command */ PHP_FUNCTION(mysqli_connect_errno) { if (zend_parse_parameters_none() == FAILURE) { @@ -398,8 +394,7 @@ PHP_FUNCTION(mysqli_connect_errno) } /* }}} */ -/* {{{ proto string mysqli_connect_error(void) - Returns the text of the error message from previous MySQL operation */ +/* {{{ Returns the text of the error message from previous MySQL operation */ PHP_FUNCTION(mysqli_connect_error) { if (zend_parse_parameters_none() == FAILURE) { @@ -414,24 +409,21 @@ PHP_FUNCTION(mysqli_connect_error) } /* }}} */ -/* {{{ proto mixed mysqli_fetch_array(object result [,int resulttype]) - Fetch a result row as an associative array, a numeric array, or both */ +/* {{{ Fetch a result row as an associative array, a numeric array, or both */ PHP_FUNCTION(mysqli_fetch_array) { php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 0); } /* }}} */ -/* {{{ proto mixed mysqli_fetch_assoc(object result) - Fetch a result row as an associative array */ +/* {{{ Fetch a result row as an associative array */ PHP_FUNCTION(mysqli_fetch_assoc) { php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_ASSOC, 0); } /* }}} */ -/* {{{ proto mixed mysqli_fetch_all(object result [,int resulttype]) - Fetches all result rows as an associative array, a numeric array, or both */ +/* {{{ Fetches all result rows as an associative array, a numeric array, or both */ #ifdef MYSQLI_USE_MYSQLND PHP_FUNCTION(mysqli_fetch_all) { @@ -454,8 +446,7 @@ PHP_FUNCTION(mysqli_fetch_all) } /* }}} */ -/* {{{ proto array mysqli_get_client_stats(void) - Returns statistics about the zval cache */ +/* {{{ Returns statistics about the zval cache */ PHP_FUNCTION(mysqli_get_client_stats) { if (zend_parse_parameters_none() == FAILURE) { @@ -465,8 +456,7 @@ PHP_FUNCTION(mysqli_get_client_stats) } /* }}} */ -/* {{{ proto array mysqli_get_connection_stats(void) - Returns statistics about the zval cache */ +/* {{{ Returns statistics about the zval cache */ PHP_FUNCTION(mysqli_get_connection_stats) { MY_MYSQL *mysql; @@ -483,8 +473,7 @@ PHP_FUNCTION(mysqli_get_connection_stats) #endif /* }}} */ -/* {{{ proto mixed mysqli_error_list(object connection) - Fetches all client errors */ +/* {{{ Fetches all client errors */ PHP_FUNCTION(mysqli_error_list) { MY_MYSQL *mysql; @@ -529,8 +518,7 @@ PHP_FUNCTION(mysqli_error_list) } /* }}} */ -/* {{{ proto string mysqli_stmt_error_list(object stmt) -*/ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_error_list) { MY_STMT *stmt; @@ -575,16 +563,14 @@ PHP_FUNCTION(mysqli_stmt_error_list) } /* }}} */ -/* {{{ proto mixed mysqli_fetch_object(object result [, string class_name [, NULL|array ctor_params]]) - Fetch a result row as an object */ +/* {{{ Fetch a result row as an object */ PHP_FUNCTION(mysqli_fetch_object) { php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQLI_ASSOC, 1); } /* }}} */ -/* {{{ proto bool mysqli_multi_query(object link, string query) - allows to execute multiple queries */ +/* {{{ allows to execute multiple queries */ PHP_FUNCTION(mysqli_multi_query) { MY_MYSQL *mysql; @@ -631,7 +617,7 @@ PHP_FUNCTION(mysqli_multi_query) } /* }}} */ -/* {{{ proto mixed mysqli_query(object link, string query [,int resultmode]) */ +/* {{{ */ PHP_FUNCTION(mysqli_query) { MY_MYSQL *mysql; @@ -835,8 +821,7 @@ static int mysqlnd_dont_poll_zval_array_from_mysqlnd_array(MYSQLND **in_array, z } /* }}} */ -/* {{{ proto int mysqli_poll(array read, array write, array error, int sec [, int usec]) U - Poll connections */ +/* {{{ Poll connections */ PHP_FUNCTION(mysqli_poll) { zval *r_array, *e_array, *dont_poll_array; @@ -899,8 +884,7 @@ PHP_FUNCTION(mysqli_poll) } /* }}} */ -/* {{{ proto int mysqli_reap_async_query(object link) U - Poll connections */ +/* {{{ Poll connections */ PHP_FUNCTION(mysqli_reap_async_query) { MY_MYSQL *mysql; @@ -952,8 +936,7 @@ PHP_FUNCTION(mysqli_reap_async_query) } /* }}} */ -/* {{{ proto object mysqli_stmt_get_result(object link) U - Buffer result set on client */ +/* {{{ Buffer result set on client */ PHP_FUNCTION(mysqli_stmt_get_result) { MYSQL_RES *result; @@ -979,7 +962,7 @@ PHP_FUNCTION(mysqli_stmt_get_result) /* }}} */ #endif -/* {{{ proto object mysqli_get_warnings(object link) */ +/* {{{ */ PHP_FUNCTION(mysqli_get_warnings) { MY_MYSQL *mysql; @@ -1009,7 +992,7 @@ PHP_FUNCTION(mysqli_get_warnings) } /* }}} */ -/* {{{ proto object mysqli_stmt_get_warnings(object link) */ +/* {{{ */ PHP_FUNCTION(mysqli_stmt_get_warnings) { MY_STMT *stmt; @@ -1035,8 +1018,7 @@ PHP_FUNCTION(mysqli_stmt_get_warnings) } /* }}} */ -/* {{{ proto bool mysqli_set_charset(object link, string csname) - sets client character set */ +/* {{{ sets client character set */ PHP_FUNCTION(mysqli_set_charset) { MY_MYSQL *mysql; @@ -1056,8 +1038,7 @@ PHP_FUNCTION(mysqli_set_charset) } /* }}} */ -/* {{{ proto object mysqli_get_charset(object link) U - returns a character set object */ +/* {{{ returns a character set object */ PHP_FUNCTION(mysqli_get_charset) { MY_MYSQL *mysql; @@ -1116,7 +1097,7 @@ PHP_FUNCTION(mysqli_get_charset) #ifndef MYSQLI_USE_MYSQLND extern char * mysqli_escape_string_for_tx_name_in_comment(const char * const name); -/* {{{ proto bool mysqli_begin_transaction_libmysql */ +/* {{{ */ static int mysqli_begin_transaction_libmysql(MYSQL * conn, const unsigned int mode, const char * const name) { int ret; @@ -1165,8 +1146,7 @@ static int mysqli_begin_transaction_libmysql(MYSQL * conn, const unsigned int mo /* }}} */ #endif -/* {{{ proto bool mysqli_begin_transaction(object link, [int flags [, string name]]) - Starts a transaction */ +/* {{{ Starts a transaction */ PHP_FUNCTION(mysqli_begin_transaction) { MY_MYSQL *mysql; @@ -1206,7 +1186,7 @@ PHP_FUNCTION(mysqli_begin_transaction) /* }}} */ #ifndef MYSQLI_USE_MYSQLND -/* {{{ proto bool mysqli_savepoint_libmysql */ +/* {{{ */ static int mysqli_savepoint_libmysql(MYSQL * conn, const char * const name, zend_bool release) { int ret; @@ -1219,8 +1199,7 @@ static int mysqli_savepoint_libmysql(MYSQL * conn, const char * const name, zend /* }}} */ #endif -/* {{{ proto bool mysqli_savepoint(object link, string name) - Starts a transaction */ +/* {{{ Starts a transaction */ PHP_FUNCTION(mysqli_savepoint) { MY_MYSQL *mysql; @@ -1248,8 +1227,7 @@ PHP_FUNCTION(mysqli_savepoint) } /* }}} */ -/* {{{ proto bool mysqli_release_savepoint(object link, string name) - Starts a transaction */ +/* {{{ Starts a transaction */ PHP_FUNCTION(mysqli_release_savepoint) { MY_MYSQL *mysql; @@ -1276,8 +1254,7 @@ PHP_FUNCTION(mysqli_release_savepoint) } /* }}} */ -/* {{{ proto bool mysqli_get_links_stats() - Returns information about open and cached links */ +/* {{{ Returns information about open and cached links */ PHP_FUNCTION(mysqli_get_links_stats) { if (zend_parse_parameters_none() == FAILURE) { diff --git a/ext/mysqli/mysqli_report.c b/ext/mysqli/mysqli_report.c index 64cff6cb49..e12015c2b0 100644 --- a/ext/mysqli/mysqli_report.c +++ b/ext/mysqli/mysqli_report.c @@ -25,8 +25,7 @@ extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno, char *format, ...); -/* {{{ proto bool mysqli_report(int flags) - sets report level */ +/* {{{ sets report level */ PHP_FUNCTION(mysqli_report) { zend_long flags; |