diff options
-rw-r--r-- | ext/mysqlnd/mysqlnd_auth.c | 72 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd_auth.h | 42 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd_commands.c | 144 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd_driver.c | 18 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd_structs.h | 2 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 2 |
6 files changed, 140 insertions, 140 deletions
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index fa04e1b831..c1c79a6449 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -36,7 +36,7 @@ static const char * const mysqlnd_old_passwd = "mysqlnd cannot connect to MySQL /* {{{ mysqlnd_run_authentication */ enum_func_status mysqlnd_run_authentication( - MYSQLND_CONN_DATA * conn, + MYSQLND_CONN_DATA * const conn, const char * const user, const char * const passwd, const size_t passwd_len, @@ -44,11 +44,11 @@ mysqlnd_run_authentication( const size_t db_len, const MYSQLND_STRING auth_plugin_data, const char * const auth_protocol, - unsigned int charset_no, + const unsigned int charset_no, const MYSQLND_SESSION_OPTIONS * const session_options, - zend_ulong mysql_flags, - zend_bool silent, - zend_bool is_change_user + const zend_ulong mysql_flags, + const zend_bool silent, + const zend_bool is_change_user ) { enum_func_status ret = FAIL; @@ -180,22 +180,22 @@ end: /* {{{ mysqlnd_switch_to_ssl_if_needed */ static enum_func_status -mysqlnd_switch_to_ssl_if_needed(MYSQLND_CONN_DATA * conn, +mysqlnd_switch_to_ssl_if_needed(MYSQLND_CONN_DATA * const conn, unsigned int charset_no, - size_t server_capabilities, + const size_t server_capabilities, const MYSQLND_SESSION_OPTIONS * const session_options, - zend_ulong mysql_flags) + const zend_ulong mysql_flags) { enum_func_status ret = FAIL; const MYSQLND_CHARSET * charset; DBG_ENTER("mysqlnd_switch_to_ssl_if_needed"); if (session_options->charset_name && (charset = mysqlnd_find_charset_name(session_options->charset_name))) { - charset_no = charset->nr; + charset_no = charset->nr; } { - size_t client_capabilities = mysql_flags; + const size_t client_capabilities = mysql_flags; ret = conn->run_command(COM_ENABLE_SSL, conn, client_capabilities, server_capabilities, charset_no); } DBG_RETURN(ret); @@ -206,18 +206,18 @@ mysqlnd_switch_to_ssl_if_needed(MYSQLND_CONN_DATA * conn, /* {{{ mysqlnd_connect_run_authentication */ enum_func_status mysqlnd_connect_run_authentication( - MYSQLND_CONN_DATA * conn, + MYSQLND_CONN_DATA * const conn, const char * const user, const char * const passwd, const char * const db, - size_t db_len, - size_t passwd_len, - MYSQLND_STRING authentication_plugin_data, + const size_t db_len, + const size_t passwd_len, + const MYSQLND_STRING authentication_plugin_data, const char * const authentication_protocol, const unsigned int charset_no, - size_t server_capabilities, + const size_t server_capabilities, const MYSQLND_SESSION_OPTIONS * const session_options, - zend_ulong mysql_flags + const zend_ulong mysql_flags ) { enum_func_status ret = FAIL; @@ -243,9 +243,9 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, const char * const db, const size_t db_len, const MYSQLND_SESSION_OPTIONS * const session_options, - zend_ulong mysql_flags, - unsigned int server_charset_no, - zend_bool use_full_blown_auth_packet, + const zend_ulong mysql_flags, + const unsigned int server_charset_no, + const zend_bool use_full_blown_auth_packet, const char * const auth_protocol, struct st_mysqlnd_authentication_plugin * auth_plugin, const zend_uchar * const orig_auth_plugin_data, @@ -253,9 +253,9 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, const zend_uchar * const auth_plugin_data, const size_t auth_plugin_data_len, char ** switch_to_auth_protocol, - size_t * switch_to_auth_protocol_len, + size_t * const switch_to_auth_protocol_len, zend_uchar ** switch_to_auth_protocol_data, - size_t * switch_to_auth_protocol_data_len + size_t * const switch_to_auth_protocol_data_len ) { enum_func_status ret = FAIL; @@ -371,14 +371,14 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn, const char * const db, const size_t db_len, const zend_bool silent, - zend_bool use_full_blown_auth_packet, + const zend_bool use_full_blown_auth_packet, const char * const auth_protocol, - zend_uchar * auth_plugin_data, - size_t auth_plugin_data_len, + const zend_uchar * const auth_plugin_data, + const size_t auth_plugin_data_len, char ** switch_to_auth_protocol, - size_t * switch_to_auth_protocol_len, + size_t * const switch_to_auth_protocol_len, zend_uchar ** switch_to_auth_protocol_data, - size_t * switch_to_auth_protocol_data_len + size_t * const switch_to_auth_protocol_data_len ) { enum_func_status ret = FAIL; @@ -559,10 +559,10 @@ static zend_uchar * mysqlnd_native_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self, size_t * auth_data_len, MYSQLND_CONN_DATA * conn, const char * const user, const char * const passwd, - const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, + const size_t passwd_len, zend_uchar * auth_plugin_data, const size_t auth_plugin_data_len, const MYSQLND_SESSION_OPTIONS * const session_options, const MYSQLND_PFC_DATA * const pfc_data, - zend_ulong mysql_flags + const zend_ulong mysql_flags ) { zend_uchar * ret = NULL; @@ -620,10 +620,10 @@ static zend_uchar * mysqlnd_pam_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self, size_t * auth_data_len, MYSQLND_CONN_DATA * conn, const char * const user, const char * const passwd, - const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, + const size_t passwd_len, zend_uchar * auth_plugin_data, const size_t auth_plugin_data_len, const MYSQLND_SESSION_OPTIONS * const session_options, const MYSQLND_PFC_DATA * const pfc_data, - zend_ulong mysql_flags + const zend_ulong mysql_flags ) { zend_uchar * ret = NULL; @@ -762,10 +762,10 @@ static zend_uchar * mysqlnd_sha256_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self, size_t * auth_data_len, MYSQLND_CONN_DATA * conn, const char * const user, const char * const passwd, - const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, + const size_t passwd_len, zend_uchar * auth_plugin_data, const size_t auth_plugin_data_len, const MYSQLND_SESSION_OPTIONS * const session_options, const MYSQLND_PFC_DATA * const pfc_data, - zend_ulong mysql_flags + const zend_ulong mysql_flags ) { RSA * server_public_key; @@ -883,10 +883,10 @@ static zend_uchar * mysqlnd_caching_sha2_get_auth_data(struct st_mysqlnd_authentication_plugin * self, size_t * auth_data_len, MYSQLND_CONN_DATA * conn, const char * const user, const char * const passwd, - const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, + const size_t passwd_len, zend_uchar * auth_plugin_data, const size_t auth_plugin_data_len, const MYSQLND_SESSION_OPTIONS * const session_options, const MYSQLND_PFC_DATA * const pfc_data, - zend_ulong mysql_flags + const zend_ulong mysql_flags ) { zend_uchar * ret = NULL; @@ -986,7 +986,7 @@ mysqlnd_caching_sha2_get_key(MYSQLND_CONN_DATA *conn) /* {{{ mysqlnd_caching_sha2_get_key */ static size_t mysqlnd_caching_sha2_get_and_use_key(MYSQLND_CONN_DATA *conn, - const zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, + const zend_uchar * auth_plugin_data, const size_t auth_plugin_data_len, unsigned char **crypted, const char * const passwd, const size_t passwd_len) @@ -1028,7 +1028,7 @@ mysqlnd_caching_sha2_get_and_use_key(MYSQLND_CONN_DATA *conn, static void mysqlnd_caching_sha2_handle_server_response(struct st_mysqlnd_authentication_plugin *self, MYSQLND_CONN_DATA * conn, - const zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, + const zend_uchar * auth_plugin_data, const size_t auth_plugin_data_len, const char * const passwd, const size_t passwd_len) { diff --git a/ext/mysqlnd/mysqlnd_auth.h b/ext/mysqlnd/mysqlnd_auth.h index 3ddb5a5f70..6c115d9e05 100644 --- a/ext/mysqlnd/mysqlnd_auth.h +++ b/ext/mysqlnd/mysqlnd_auth.h @@ -27,9 +27,9 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, const char * const db, const size_t db_len, const MYSQLND_SESSION_OPTIONS * const session_options, - zend_ulong mysql_flags, - unsigned int server_charset_no, - zend_bool use_full_blown_auth_packet, + const zend_ulong mysql_flags, + const unsigned int server_charset_no, + const zend_bool use_full_blown_auth_packet, const char * const auth_protocol, struct st_mysqlnd_authentication_plugin * auth_plugin, const zend_uchar * const orig_auth_plugin_data, @@ -37,9 +37,9 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, const zend_uchar * const auth_plugin_data, const size_t auth_plugin_data_len, char ** switch_to_auth_protocol, - size_t * switch_to_auth_protocol_len, + size_t * const switch_to_auth_protocol_len, zend_uchar ** switch_to_auth_protocol_data, - size_t * switch_to_auth_protocol_data_len + size_t * const switch_to_auth_protocol_data_len ); enum_func_status @@ -51,36 +51,36 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn, const char * const db, const size_t db_len, const zend_bool silent, - zend_bool use_full_blown_auth_packet, + const zend_bool use_full_blown_auth_packet, const char * const auth_protocol, - zend_uchar * auth_plugin_data, - size_t auth_plugin_data_len, + const zend_uchar * auth_plugin_data, + const size_t auth_plugin_data_len, char ** switch_to_auth_protocol, - size_t * switch_to_auth_protocol_len, + size_t * const switch_to_auth_protocol_len, zend_uchar ** switch_to_auth_protocol_data, - size_t * switch_to_auth_protocol_data_len + size_t * const switch_to_auth_protocol_data_len ); enum_func_status mysqlnd_connect_run_authentication( - MYSQLND_CONN_DATA * conn, + MYSQLND_CONN_DATA * const conn, const char * const user, const char * const passwd, const char * const db, - size_t db_len, - size_t passwd_len, - MYSQLND_STRING authentication_plugin_data, + const size_t db_len, + const size_t passwd_len, + const MYSQLND_STRING authentication_plugin_data, const char * const authentication_protocol, const unsigned int charset_no, - size_t server_capabilities, + const size_t server_capabilities, const MYSQLND_SESSION_OPTIONS * const session_options, - zend_ulong mysql_flags + const zend_ulong mysql_flags ); enum_func_status mysqlnd_run_authentication( - MYSQLND_CONN_DATA * conn, + MYSQLND_CONN_DATA * const conn, const char * const user, const char * const passwd, const size_t passwd_len, @@ -88,11 +88,11 @@ mysqlnd_run_authentication( const size_t db_len, const MYSQLND_STRING auth_plugin_data, const char * const auth_protocol, - unsigned int charset_no, + const unsigned int charset_no, const MYSQLND_SESSION_OPTIONS * const session_options, - zend_ulong mysql_flags, - zend_bool silent, - zend_bool is_change_user + const zend_ulong mysql_flags, + const zend_bool silent, + const zend_bool is_change_user ); PHPAPI void php_mysqlnd_scramble(zend_uchar * const buffer, const zend_uchar * const scramble, const zend_uchar * const pass, const size_t pass_len); diff --git a/ext/mysqlnd/mysqlnd_commands.c b/ext/mysqlnd/mysqlnd_commands.c index 21b95a8f57..9d303058f1 100644 --- a/ext/mysqlnd/mysqlnd_commands.c +++ b/ext/mysqlnd/mysqlnd_commands.c @@ -51,13 +51,13 @@ struct st_mysqlnd_protocol_com_set_option_command static enum_func_status mysqlnd_com_set_option_run(void *cmd) { - struct st_mysqlnd_protocol_com_set_option_command * command = (struct st_mysqlnd_protocol_com_set_option_command *) cmd; + const struct st_mysqlnd_protocol_com_set_option_command * const command = (const struct st_mysqlnd_protocol_com_set_option_command *) cmd; zend_uchar buffer[2]; enum_func_status ret = FAIL; MYSQLND_CONN_DATA * conn = command->context.conn; - enum_mysqlnd_server_option option = command->context.option; - func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; - func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; + const enum_mysqlnd_server_option option = command->context.option; + const func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; + const func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; DBG_ENTER("mysqlnd_com_set_option_run"); int2store(buffer, (unsigned int) option); @@ -101,11 +101,11 @@ mysqlnd_com_set_option_run_command(va_list args) static enum_func_status mysqlnd_com_debug_run(void *cmd) { - struct st_mysqlnd_protocol_no_params_command * command = (struct st_mysqlnd_protocol_no_params_command *) cmd; + const struct st_mysqlnd_protocol_no_params_command * const command = (const struct st_mysqlnd_protocol_no_params_command *) cmd; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; - func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; - func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; + MYSQLND_CONN_DATA * const conn = command->context.conn; + const func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; + const func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; DBG_ENTER("mysqlnd_com_debug_run"); @@ -158,16 +158,16 @@ struct st_mysqlnd_protocol_com_init_db_command static enum_func_status mysqlnd_com_init_db_run(void *cmd) { - struct st_mysqlnd_protocol_com_init_db_command * command = (struct st_mysqlnd_protocol_com_init_db_command *) cmd; + const struct st_mysqlnd_protocol_com_init_db_command * const command = (const struct st_mysqlnd_protocol_com_init_db_command *) cmd; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; + MYSQLND_CONN_DATA * const conn = command->context.conn; const MYSQLND_CSTRING db = command->context.db; - func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; - func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; + const func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; + const func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; DBG_ENTER("mysqlnd_com_init_db_run"); - ret = send_command(conn->payload_decoder_factory, COM_INIT_DB, (zend_uchar*) command->context.db.s, command->context.db.l, FALSE, + ret = send_command(conn->payload_decoder_factory, COM_INIT_DB, (const zend_uchar*) command->context.db.s, command->context.db.l, FALSE, &conn->state, conn->error_info, conn->upsert_status, @@ -225,11 +225,11 @@ mysqlnd_com_init_db_run_command(va_list args) static enum_func_status mysqlnd_com_ping_run(void *cmd) { - struct st_mysqlnd_protocol_no_params_command * command = (struct st_mysqlnd_protocol_no_params_command *) cmd; + const struct st_mysqlnd_protocol_no_params_command * const command = (const struct st_mysqlnd_protocol_no_params_command *) cmd; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; - func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; - func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; + MYSQLND_CONN_DATA * const conn = command->context.conn; + const func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; + const func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; DBG_ENTER("mysqlnd_com_ping_run"); @@ -287,11 +287,11 @@ struct st_mysqlnd_protocol_com_statistics_command static enum_func_status mysqlnd_com_statistics_run(void *cmd) { - struct st_mysqlnd_protocol_com_statistics_command * command = (struct st_mysqlnd_protocol_com_statistics_command *) cmd; + const struct st_mysqlnd_protocol_com_statistics_command * const command = (const struct st_mysqlnd_protocol_com_statistics_command *) cmd; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; + MYSQLND_CONN_DATA * const conn = command->context.conn; zend_string **message = command->context.message; - func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; + const func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; DBG_ENTER("mysqlnd_com_statistics_run"); @@ -353,13 +353,13 @@ struct st_mysqlnd_protocol_com_process_kill_command enum_func_status mysqlnd_com_process_kill_run(void *cmd) { - struct st_mysqlnd_protocol_com_process_kill_command * command = (struct st_mysqlnd_protocol_com_process_kill_command *) cmd; + const struct st_mysqlnd_protocol_com_process_kill_command * const command = (const struct st_mysqlnd_protocol_com_process_kill_command *) cmd; zend_uchar buff[4]; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; - zend_bool read_response = command->context.read_response; - func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; - func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; + MYSQLND_CONN_DATA * const conn = command->context.conn; + const zend_bool read_response = command->context.read_response; + const func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; + const func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; DBG_ENTER("mysqlnd_com_process_kill_run"); int4store(buff, command->context.process_id); @@ -425,12 +425,12 @@ struct st_mysqlnd_protocol_com_refresh_command enum_func_status mysqlnd_com_refresh_run(void *cmd) { - struct st_mysqlnd_protocol_com_refresh_command * command = (struct st_mysqlnd_protocol_com_refresh_command *) cmd; + const struct st_mysqlnd_protocol_com_refresh_command * const command = (const struct st_mysqlnd_protocol_com_refresh_command *) cmd; zend_uchar bits[1]; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; - func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; - func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; + MYSQLND_CONN_DATA * const conn = command->context.conn; + const func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; + const func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; DBG_ENTER("mysqlnd_com_refresh_run"); int1store(bits, command->context.options); @@ -485,12 +485,12 @@ struct st_mysqlnd_protocol_com_shutdown_command enum_func_status mysqlnd_com_shutdown_run(void *cmd) { - struct st_mysqlnd_protocol_com_shutdown_command * command = (struct st_mysqlnd_protocol_com_shutdown_command *) cmd; + const struct st_mysqlnd_protocol_com_shutdown_command * const command = (const struct st_mysqlnd_protocol_com_shutdown_command *) cmd; zend_uchar bits[1]; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; - func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; - func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; + MYSQLND_CONN_DATA * const conn = command->context.conn; + const func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; + const func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; DBG_ENTER("mysqlnd_com_shutdown_run"); int1store(bits, command->context.level); @@ -544,10 +544,10 @@ struct st_mysqlnd_protocol_com_quit_command enum_func_status mysqlnd_com_quit_run(void *cmd) { - struct st_mysqlnd_protocol_com_quit_command * command = (struct st_mysqlnd_protocol_com_quit_command *) cmd; + const struct st_mysqlnd_protocol_com_quit_command * const command = (const struct st_mysqlnd_protocol_com_quit_command *) cmd; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; - func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; + MYSQLND_CONN_DATA * const conn = command->context.conn; + const func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; DBG_ENTER("mysqlnd_com_quit_run"); @@ -595,14 +595,14 @@ struct st_mysqlnd_protocol_com_query_command static enum_func_status mysqlnd_com_query_run(void *cmd) { - struct st_mysqlnd_protocol_com_query_command * command = (struct st_mysqlnd_protocol_com_query_command *) cmd; + const struct st_mysqlnd_protocol_com_query_command * const command = (const struct st_mysqlnd_protocol_com_query_command *) cmd; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; + MYSQLND_CONN_DATA * const conn = command->context.conn; func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; DBG_ENTER("mysqlnd_com_query_run"); - ret = send_command(conn->payload_decoder_factory, COM_QUERY, (zend_uchar*) command->context.query.s, command->context.query.l, FALSE, + ret = send_command(conn->payload_decoder_factory, COM_QUERY, (const zend_uchar*) command->context.query.s, command->context.query.l, FALSE, &conn->state, conn->error_info, conn->upsert_status, @@ -652,14 +652,14 @@ struct st_mysqlnd_protocol_com_change_user_command static enum_func_status mysqlnd_com_change_user_run(void *cmd) { - struct st_mysqlnd_protocol_com_change_user_command * command = (struct st_mysqlnd_protocol_com_change_user_command *) cmd; + const struct st_mysqlnd_protocol_com_change_user_command * const command = (const struct st_mysqlnd_protocol_com_change_user_command *) cmd; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; - func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; + MYSQLND_CONN_DATA * const conn = command->context.conn; + const func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; DBG_ENTER("mysqlnd_com_change_user_run"); - ret = send_command(conn->payload_decoder_factory, COM_CHANGE_USER, (zend_uchar*) command->context.payload.s, command->context.payload.l, command->context.silent, + ret = send_command(conn->payload_decoder_factory, COM_CHANGE_USER, (const zend_uchar*) command->context.payload.s, command->context.payload.l, command->context.silent, &conn->state, conn->error_info, conn->upsert_status, @@ -705,9 +705,9 @@ struct st_mysqlnd_protocol_com_reap_result_command static enum_func_status mysqlnd_com_reap_result_run(void *cmd) { - struct st_mysqlnd_protocol_com_reap_result_command * command = (struct st_mysqlnd_protocol_com_reap_result_command *) cmd; + const struct st_mysqlnd_protocol_com_reap_result_command * const command = (const struct st_mysqlnd_protocol_com_reap_result_command *) cmd; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; + MYSQLND_CONN_DATA * const conn = command->context.conn; const enum_mysqlnd_connection_state state = GET_CONNECTION_STATE(&conn->state); DBG_ENTER("mysqlnd_com_reap_result_run"); @@ -755,14 +755,14 @@ struct st_mysqlnd_protocol_com_stmt_prepare_command static enum_func_status mysqlnd_com_stmt_prepare_run(void *cmd) { - struct st_mysqlnd_protocol_com_stmt_prepare_command * command = (struct st_mysqlnd_protocol_com_stmt_prepare_command *) cmd; + const struct st_mysqlnd_protocol_com_stmt_prepare_command * const command = (const struct st_mysqlnd_protocol_com_stmt_prepare_command *) cmd; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; + MYSQLND_CONN_DATA * const conn = command->context.conn; func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; DBG_ENTER("mysqlnd_com_stmt_prepare_run"); - ret = send_command(conn->payload_decoder_factory, COM_STMT_PREPARE, (zend_uchar*) command->context.query.s, command->context.query.l, FALSE, + ret = send_command(conn->payload_decoder_factory, COM_STMT_PREPARE, (const zend_uchar*) command->context.query.s, command->context.query.l, FALSE, &conn->state, conn->error_info, conn->upsert_status, @@ -808,14 +808,14 @@ struct st_mysqlnd_protocol_com_stmt_execute_command static enum_func_status mysqlnd_com_stmt_execute_run(void *cmd) { - struct st_mysqlnd_protocol_com_stmt_execute_command * command = (struct st_mysqlnd_protocol_com_stmt_execute_command *) cmd; + const struct st_mysqlnd_protocol_com_stmt_execute_command * const command = (const struct st_mysqlnd_protocol_com_stmt_execute_command *) cmd; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; + MYSQLND_CONN_DATA * const conn = command->context.conn; func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; DBG_ENTER("mysqlnd_com_stmt_execute_run"); - ret = send_command(conn->payload_decoder_factory, COM_STMT_EXECUTE, (zend_uchar*) command->context.payload.s, command->context.payload.l, FALSE, + ret = send_command(conn->payload_decoder_factory, COM_STMT_EXECUTE, (const zend_uchar*) command->context.payload.s, command->context.payload.l, FALSE, &conn->state, conn->error_info, conn->upsert_status, @@ -861,14 +861,14 @@ struct st_mysqlnd_protocol_com_stmt_fetch_command static enum_func_status mysqlnd_com_stmt_fetch_run(void *cmd) { - struct st_mysqlnd_protocol_com_stmt_fetch_command * command = (struct st_mysqlnd_protocol_com_stmt_fetch_command *) cmd; + const struct st_mysqlnd_protocol_com_stmt_fetch_command * const command = (const struct st_mysqlnd_protocol_com_stmt_fetch_command *) cmd; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; + MYSQLND_CONN_DATA * const conn = command->context.conn; func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; DBG_ENTER("mysqlnd_com_stmt_fetch_run"); - ret = send_command(conn->payload_decoder_factory, COM_STMT_FETCH, (zend_uchar*) command->context.payload.s, command->context.payload.l, FALSE, + ret = send_command(conn->payload_decoder_factory, COM_STMT_FETCH, (const zend_uchar*) command->context.payload.s, command->context.payload.l, FALSE, &conn->state, conn->error_info, conn->upsert_status, @@ -915,11 +915,11 @@ static enum_func_status mysqlnd_com_stmt_reset_run(void *cmd) { zend_uchar cmd_buf[MYSQLND_STMT_ID_LENGTH /* statement id */]; - struct st_mysqlnd_protocol_com_stmt_reset_command * command = (struct st_mysqlnd_protocol_com_stmt_reset_command *) cmd; + const struct st_mysqlnd_protocol_com_stmt_reset_command * const command = (const struct st_mysqlnd_protocol_com_stmt_reset_command *) cmd; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; - func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; - func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; + MYSQLND_CONN_DATA * const conn = command->context.conn; + const func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; + const func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response = conn->payload_decoder_factory->m.send_command_handle_response; DBG_ENTER("mysqlnd_com_stmt_reset_run"); @@ -974,14 +974,14 @@ struct st_mysqlnd_protocol_com_stmt_send_long_data_command static enum_func_status mysqlnd_com_stmt_send_long_data_run(void *cmd) { - struct st_mysqlnd_protocol_com_stmt_send_long_data_command * command = (struct st_mysqlnd_protocol_com_stmt_send_long_data_command *) cmd; + const struct st_mysqlnd_protocol_com_stmt_send_long_data_command * const command = (const struct st_mysqlnd_protocol_com_stmt_send_long_data_command *) cmd; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; + MYSQLND_CONN_DATA * const conn = command->context.conn; func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; DBG_ENTER("mysqlnd_com_stmt_send_long_data_run"); - ret = send_command(conn->payload_decoder_factory, COM_STMT_SEND_LONG_DATA, (zend_uchar*) command->context.payload.s, command->context.payload.l, FALSE, + ret = send_command(conn->payload_decoder_factory, COM_STMT_SEND_LONG_DATA, (const zend_uchar*) command->context.payload.s, command->context.payload.l, FALSE, &conn->state, conn->error_info, conn->upsert_status, @@ -1028,9 +1028,9 @@ static enum_func_status mysqlnd_com_stmt_close_run(void *cmd) { zend_uchar cmd_buf[MYSQLND_STMT_ID_LENGTH /* statement id */]; - struct st_mysqlnd_protocol_com_stmt_close_command * command = (struct st_mysqlnd_protocol_com_stmt_close_command *) cmd; + const struct st_mysqlnd_protocol_com_stmt_close_command * const command = (const struct st_mysqlnd_protocol_com_stmt_close_command *) cmd; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; + MYSQLND_CONN_DATA * const conn = command->context.conn; func_mysqlnd_protocol_payload_decoder_factory__send_command send_command = conn->payload_decoder_factory->m.send_command; DBG_ENTER("mysqlnd_com_stmt_close_run"); @@ -1085,12 +1085,12 @@ struct st_mysqlnd_protocol_com_enable_ssl_command static enum_func_status mysqlnd_com_enable_ssl_run(void *cmd) { - struct st_mysqlnd_protocol_com_enable_ssl_command * command = (struct st_mysqlnd_protocol_com_enable_ssl_command *) cmd; + const struct st_mysqlnd_protocol_com_enable_ssl_command * const command = (const struct st_mysqlnd_protocol_com_enable_ssl_command *) cmd; enum_func_status ret = FAIL; - MYSQLND_CONN_DATA * conn = command->context.conn; + MYSQLND_CONN_DATA * const conn = command->context.conn; MYSQLND_PACKET_AUTH auth_packet; - size_t client_capabilities = command->context.client_capabilities; - size_t server_capabilities = command->context.server_capabilities; + const size_t client_capabilities = command->context.client_capabilities; + const size_t server_capabilities = command->context.server_capabilities; DBG_ENTER("mysqlnd_com_enable_ssl_run"); DBG_INF_FMT("client_capability_flags=%lu", client_capabilities); @@ -1206,16 +1206,16 @@ struct st_mysqlnd_protocol_com_handshake_command static enum_func_status mysqlnd_com_handshake_run(void *cmd) { - struct st_mysqlnd_protocol_com_handshake_command * command = (struct st_mysqlnd_protocol_com_handshake_command *) cmd; + const struct st_mysqlnd_protocol_com_handshake_command * const command = (const struct st_mysqlnd_protocol_com_handshake_command *) cmd; const char * user = command->context.user.s; const char * passwd = command->context.passwd.s; - size_t passwd_len = command->context.passwd.l; + const size_t passwd_len = command->context.passwd.l; const char * db = command->context.database.s; - size_t db_len = command->context.database.l; + const size_t db_len = command->context.database.l; - size_t mysql_flags = command->context.client_flags; + const size_t mysql_flags = command->context.client_flags; MYSQLND_CONN_DATA * conn = command->context.conn; MYSQLND_PACKET_GREET greet_packet; @@ -1303,7 +1303,7 @@ mysqlnd_com_handshake_run_command(va_list args) /* {{{ _mysqlnd_run_command */ static enum_func_status -_mysqlnd_run_command(enum php_mysqlnd_server_command command, ...) +_mysqlnd_run_command(const enum php_mysqlnd_server_command command, ...) { enum_func_status ret = FAIL; va_list args; diff --git a/ext/mysqlnd/mysqlnd_driver.c b/ext/mysqlnd/mysqlnd_driver.c index b61720fe7c..dc08c649bc 100644 --- a/ext/mysqlnd/mysqlnd_driver.c +++ b/ext/mysqlnd/mysqlnd_driver.c @@ -98,8 +98,8 @@ PHPAPI void mysqlnd_library_init(void) static MYSQLND * MYSQLND_METHOD(mysqlnd_object_factory, get_connection)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) *factory, const zend_bool persistent) { - size_t alloc_size_ret = sizeof(MYSQLND) + mysqlnd_plugin_count() * sizeof(void *); - size_t alloc_size_ret_data = sizeof(MYSQLND_CONN_DATA) + mysqlnd_plugin_count() * sizeof(void *); + const size_t alloc_size_ret = sizeof(MYSQLND) + mysqlnd_plugin_count() * sizeof(void *); + const size_t alloc_size_ret_data = sizeof(MYSQLND_CONN_DATA) + mysqlnd_plugin_count() * sizeof(void *); MYSQLND * new_object; MYSQLND_CONN_DATA * data; @@ -159,7 +159,7 @@ MYSQLND_METHOD(mysqlnd_object_factory, get_connection)(MYSQLND_CLASS_METHODS_TYP static MYSQLND * MYSQLND_METHOD(mysqlnd_object_factory, clone_connection_object)(MYSQLND * to_be_cloned) { - size_t alloc_size_ret = sizeof(MYSQLND) + mysqlnd_plugin_count() * sizeof(void *); + const size_t alloc_size_ret = sizeof(MYSQLND) + mysqlnd_plugin_count() * sizeof(void *); MYSQLND * new_object; DBG_ENTER("mysqlnd_driver::clone_connection_object"); @@ -188,7 +188,7 @@ MYSQLND_METHOD(mysqlnd_object_factory, clone_connection_object)(MYSQLND * to_be_ static MYSQLND_STMT * MYSQLND_METHOD(mysqlnd_object_factory, get_prepared_statement)(MYSQLND_CONN_DATA * const conn) { - size_t alloc_size = sizeof(MYSQLND_STMT) + mysqlnd_plugin_count() * sizeof(void *); + const size_t alloc_size = sizeof(MYSQLND_STMT) + mysqlnd_plugin_count() * sizeof(void *); MYSQLND_STMT * ret = mnd_ecalloc(1, alloc_size); MYSQLND_STMT_DATA * stmt = NULL; @@ -245,8 +245,8 @@ MYSQLND_METHOD(mysqlnd_object_factory, get_prepared_statement)(MYSQLND_CONN_DATA static MYSQLND_PFC * MYSQLND_METHOD(mysqlnd_object_factory, get_pfc)(const zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info) { - size_t pfc_alloc_size = ZEND_MM_ALIGNED_SIZE(sizeof(MYSQLND_PFC) + mysqlnd_plugin_count() * sizeof(void *)); - size_t pfc_data_alloc_size = sizeof(MYSQLND_PFC_DATA) + mysqlnd_plugin_count() * sizeof(void *); + const size_t pfc_alloc_size = ZEND_MM_ALIGNED_SIZE(sizeof(MYSQLND_PFC) + mysqlnd_plugin_count() * sizeof(void *)); + const size_t pfc_data_alloc_size = sizeof(MYSQLND_PFC_DATA) + mysqlnd_plugin_count() * sizeof(void *); MYSQLND_PFC * pfc = mnd_pecalloc(1, pfc_alloc_size + pfc_data_alloc_size, persistent); DBG_ENTER("mysqlnd_object_factory::get_pfc"); @@ -270,8 +270,8 @@ MYSQLND_METHOD(mysqlnd_object_factory, get_pfc)(const zend_bool persistent, MYSQ static MYSQLND_VIO * MYSQLND_METHOD(mysqlnd_object_factory, get_vio)(const zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info) { - size_t vio_alloc_size = ZEND_MM_ALIGNED_SIZE(sizeof(MYSQLND_VIO) + mysqlnd_plugin_count() * sizeof(void *)); - size_t vio_data_alloc_size = sizeof(MYSQLND_VIO_DATA) + mysqlnd_plugin_count() * sizeof(void *); + const size_t vio_alloc_size = ZEND_MM_ALIGNED_SIZE(sizeof(MYSQLND_VIO) + mysqlnd_plugin_count() * sizeof(void *)); + const size_t vio_data_alloc_size = sizeof(MYSQLND_VIO_DATA) + mysqlnd_plugin_count() * sizeof(void *); MYSQLND_VIO * vio = mnd_pecalloc(1, vio_alloc_size + vio_data_alloc_size, persistent); DBG_ENTER("mysqlnd_object_factory::get_vio"); @@ -295,7 +295,7 @@ MYSQLND_METHOD(mysqlnd_object_factory, get_vio)(const zend_bool persistent, MYSQ static MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * MYSQLND_METHOD(mysqlnd_object_factory, get_protocol_payload_decoder_factory)(MYSQLND_CONN_DATA * conn, const zend_bool persistent) { - size_t alloc_size = sizeof(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY) + mysqlnd_plugin_count() * sizeof(void *); + const size_t alloc_size = sizeof(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY) + mysqlnd_plugin_count() * sizeof(void *); MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY *ret = mnd_pecalloc(1, alloc_size, persistent); DBG_ENTER("mysqlnd_object_factory::get_protocol_payload_decoder_factory"); diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index 58f9e71e6a..5ab5798355 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -1338,7 +1338,7 @@ typedef zend_uchar * (*func_auth_plugin__get_auth_data)(struct st_mysqlnd_authen MYSQLND_CONN_DATA * conn, const char * const user, const char * const passwd, const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, const MYSQLND_SESSION_OPTIONS * const session_options, - const MYSQLND_PFC_DATA * const pfc_data, zend_ulong mysql_flags + const MYSQLND_PFC_DATA * const pfc_data, const zend_ulong mysql_flags ); typedef void (*func_auth_plugin__handle_server_response)(struct st_mysqlnd_authentication_plugin * self, diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 1b7f4a935e..fd7dfe515b 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -2480,7 +2480,7 @@ MYSQLND_METHOD(mysqlnd_protocol, send_command)( const zend_bool silent, struct st_mysqlnd_connection_state * connection_state, - MYSQLND_ERROR_INFO * error_info, + MYSQLND_ERROR_INFO * error_info, MYSQLND_UPSERT_STATUS * upsert_status, MYSQLND_STATS * stats, func_mysqlnd_conn_data__send_close send_close, |