cosmetics. typedef-ed types should be in capital case

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 23af6dca9274da205503d3b1aa2b32051c3e39f6..63033be4bdb9157838a43c378b979db78fb0013a 100644 (file)
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -241,7 +241,7 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_conn, dtor)(MYSQLND *conn TSRMLS_DC)
 
 /* {{{ mysqlnd_conn::simple_command_handle_response */
 static enum_func_status
-MYSQLND_METHOD(mysqlnd_conn, simple_command_handle_response)(MYSQLND *conn, enum php_mysql_packet_type ok_packet,
+MYSQLND_METHOD(mysqlnd_conn, simple_command_handle_response)(MYSQLND *conn, enum mysqlnd_packet_type ok_packet,
                                                                                                                         zend_bool silent, enum php_mysqlnd_server_command command,
                                                                                                                         zend_bool ignore_upsert_status TSRMLS_DC)
 {
@@ -252,7 +252,7 @@ MYSQLND_METHOD(mysqlnd_conn, simple_command_handle_response)(MYSQLND *conn, enum
 
        switch (ok_packet) {
                case PROT_OK_PACKET:{
-                       php_mysql_packet_ok * ok_response = conn->protocol->m.get_ok_packet(conn->protocol, FALSE TSRMLS_CC);
+                       MYSQLND_PACKET_OK * ok_response = conn->protocol->m.get_ok_packet(conn->protocol, FALSE TSRMLS_CC);
                        if (FAIL == (ret = PACKET_READ(ok_response, conn))) {
                                if (!silent) {
                                        DBG_ERR_FMT("Error while reading %s's OK packet", mysqlnd_command_to_text[command]);
@@ -293,7 +293,7 @@ MYSQLND_METHOD(mysqlnd_conn, simple_command_handle_response)(MYSQLND *conn, enum
                        break;
                }
                case PROT_EOF_PACKET:{
-                       php_mysql_packet_eof * ok_response = conn->protocol->m.get_eof_packet(conn->protocol, FALSE TSRMLS_CC);
+                       MYSQLND_PACKET_EOF * ok_response = conn->protocol->m.get_eof_packet(conn->protocol, FALSE TSRMLS_CC);
                        if (FAIL == (ret = PACKET_READ(ok_response, conn))) {
                                SET_CLIENT_ERROR(conn->error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE,
                                                                 "Malformed packet");
@@ -338,11 +338,11 @@ MYSQLND_METHOD(mysqlnd_conn, simple_command_handle_response)(MYSQLND *conn, enum
 /* {{{ mysqlnd_conn::simple_command */
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_conn, simple_command)(MYSQLND *conn, enum php_mysqlnd_server_command command,
-                          const char * const arg, size_t arg_len, enum php_mysql_packet_type ok_packet, zend_bool silent,
+                          const char * const arg, size_t arg_len, enum mysqlnd_packet_type ok_packet, zend_bool silent,
                           zend_bool ignore_upsert_status TSRMLS_DC)
 {
        enum_func_status ret = PASS;
-       php_mysql_packet_command * cmd_packet;
+       MYSQLND_PACKET_COMMAND * cmd_packet;
 
        DBG_ENTER("mysqlnd_conn::simple_command");
        DBG_INF_FMT("command=%s ok_packet=%d silent=%d", mysqlnd_command_to_text[command], ok_packet, silent);
@@ -475,9 +475,9 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND *conn,
        zend_bool reconnect = FALSE;
        zend_bool saved_compression = FALSE;
 
-       php_mysql_packet_greet * greet_packet = NULL;
-       php_mysql_packet_auth * auth_packet = NULL;
-       php_mysql_packet_ok * ok_packet = NULL;
+       MYSQLND_PACKET_GREET * greet_packet = NULL;
+       MYSQLND_PACKET_AUTH * auth_packet = NULL;
+       MYSQLND_PACKET_OK * ok_packet = NULL;
 
        DBG_ENTER("mysqlnd_conn::connect");
 
@@ -1262,7 +1262,7 @@ static enum_func_status
 MYSQLND_METHOD(mysqlnd_conn, stat)(MYSQLND *conn, char **message, unsigned int * message_len TSRMLS_DC)
 {
        enum_func_status ret;
-       php_mysql_packet_stats * stats_header;
+       MYSQLND_PACKET_STATS * stats_header;
 
        DBG_ENTER("mysqlnd_conn::stat");
        DBG_INF_FMT("conn=%llu", conn->thread_id);
@@ -1770,7 +1770,7 @@ MYSQLND_METHOD(mysqlnd_conn, change_user)(MYSQLND * const conn,
        */
        size_t user_len;
        enum_func_status ret;
-       php_mysql_packet_chg_user_resp * chg_user_resp;
+       MYSQLND_PACKET_CHG_USER_RESPONSE * chg_user_resp;
        char buffer[MYSQLND_MAX_ALLOWED_USER_LEN + 1 + SCRAMBLE_LENGTH + MYSQLND_MAX_ALLOWED_DB_LEN + 1];
        char *p = buffer;
 
@@ -1832,7 +1832,7 @@ MYSQLND_METHOD(mysqlnd_conn, change_user)(MYSQLND * const conn,
                if (mysqlnd_get_server_version(conn) > 50113L &&
                        mysqlnd_get_server_version(conn) < 50118L)
                {
-                       php_mysql_packet_ok * redundant_error_packet = conn->protocol->m.get_ok_packet(conn->protocol, FALSE TSRMLS_CC);
+                       MYSQLND_PACKET_OK * redundant_error_packet = conn->protocol->m.get_ok_packet(conn->protocol, FALSE TSRMLS_CC);
                        PACKET_READ(redundant_error_packet, conn);
                        PACKET_FREE(redundant_error_packet);
                        DBG_INF_FMT("Server is %d, buggy, sends two ERR messages", mysqlnd_get_server_version(conn));

diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h
index 693ec9f491eb43d9b884402215e1049101638e6b..8404fbeb6e2a8bccb666f7679e41dae71968b8ab 100644 (file)
--- a/ext/mysqlnd/mysqlnd_enum_n_def.h
+++ b/ext/mysqlnd/mysqlnd_enum_n_def.h
@@ -479,7 +479,7 @@ typedef enum mysqlnd_collected_stats
 
 
 /* Enums */
-enum php_mysql_packet_type
+enum mysqlnd_packet_type
 {
        PROT_GREET_PACKET= 0,
        PROT_AUTH_PACKET,
@@ -491,7 +491,7 @@ enum php_mysql_packet_type
        PROT_ROW_PACKET,
        PROT_STATS_PACKET,
        PROT_PREPARE_RESP_PACKET,
-       PROT_CHG_USER_PACKET,
+       PROT_CHG_USER_RESP_PACKET,
        PROT_LAST, /* should always be last */
 };
 

diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c
index 627fdd22cb1b5dedd06f9cc6167c42268bc46ce6..d5677ed6d668f33afc81f967bae640d276bb3480 100644 (file)
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@ -218,7 +218,7 @@ mysqlnd_stmt_skip_metadata(MYSQLND_STMT *stmt TSRMLS_DC)
        /* Follows parameter metadata, we have just to skip it, as libmysql does */
        unsigned int i = 0;
        enum_func_status ret = PASS;
-       php_mysql_packet_res_field * field_packet;
+       MYSQLND_PACKET_RES_FIELD * field_packet;
 
        DBG_ENTER("mysqlnd_stmt_skip_metadata");
        DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
@@ -242,7 +242,7 @@ mysqlnd_stmt_skip_metadata(MYSQLND_STMT *stmt TSRMLS_DC)
 static enum_func_status
 mysqlnd_stmt_read_prepare_response(MYSQLND_STMT *stmt TSRMLS_DC)
 {
-       php_mysql_packet_prepare_response * prepare_resp;
+       MYSQLND_PACKET_PREPARE_RESPONSE * prepare_resp;
        enum_func_status ret = PASS;
 
        DBG_ENTER("mysqlnd_stmt_read_prepare_response");
@@ -276,7 +276,7 @@ done:
 static enum_func_status
 mysqlnd_stmt_prepare_read_eof(MYSQLND_STMT *stmt TSRMLS_DC)
 {
-       php_mysql_packet_eof * fields_eof;
+       MYSQLND_PACKET_EOF * fields_eof;
        enum_func_status ret;
 
        DBG_ENTER("mysqlnd_stmt_prepare_read_eof");
@@ -726,7 +726,7 @@ mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES *result, void *param, unsigned int
 {
        enum_func_status ret;
        MYSQLND_STMT *stmt = (MYSQLND_STMT *) param;
-       php_mysql_packet_row *row_packet = result->row_packet;
+       MYSQLND_PACKET_ROW *row_packet = result->row_packet;
 
        DBG_ENTER("mysqlnd_stmt_fetch_row_unbuffered");
 
@@ -891,7 +891,7 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, unsigned int fla
        enum_func_status ret;
        MYSQLND_STMT *stmt = (MYSQLND_STMT *) param;
        zend_uchar buf[STMT_ID_LENGTH /* statement id */ + 4 /* number of rows to fetch */];
-       php_mysql_packet_row *row_packet = result->row_packet;
+       MYSQLND_PACKET_ROW *row_packet = result->row_packet;
 
        DBG_ENTER("mysqlnd_fetch_stmt_row_cursor");
 

diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index 5242321f3738d78548e1fd56d6233a2c7424810e..35e7298dd880132a3605a081e7ab17d6c17c4e77 100644 (file)
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -354,7 +354,7 @@ enum_func_status
 mysqlnd_query_read_result_set_header(MYSQLND *conn, MYSQLND_STMT *stmt TSRMLS_DC)
 {
        enum_func_status ret;
-       php_mysql_packet_rset_header * rset_header;
+       MYSQLND_PACKET_RSET_HEADER * rset_header;
 
        DBG_ENTER("mysqlnd_query_read_result_set_header");
        DBG_INF_FMT("stmt=%d", stmt? stmt->stmt_id:0);
@@ -423,7 +423,7 @@ mysqlnd_query_read_result_set_header(MYSQLND *conn, MYSQLND_STMT *stmt TSRMLS_DC
                                MYSQLND_INC_CONN_STATISTIC(conn->stats, STAT_NON_RSET_QUERY);
                                break;
                        default:{                       /* Result set   */
-                               php_mysql_packet_eof * fields_eof;
+                               MYSQLND_PACKET_EOF * fields_eof;
                                MYSQLND_RES *result;
                                enum_mysqlnd_collected_stats stat = STAT_LAST;
 
@@ -596,7 +596,7 @@ mysqlnd_fetch_row_unbuffered_c(MYSQLND_RES *result TSRMLS_DC)
        MYSQLND_ROW_C                   retrow = NULL;
        unsigned int                    i,
                                                        field_count = result->field_count;
-       php_mysql_packet_row    *row_packet = result->row_packet;
+       MYSQLND_PACKET_ROW      *row_packet = result->row_packet;
        unsigned long                   *lengths = result->lengths;
 
        DBG_ENTER("mysqlnd_fetch_row_unbuffered_c");
@@ -703,7 +703,7 @@ mysqlnd_fetch_row_unbuffered(MYSQLND_RES *result, void *param, unsigned int flag
 {
        enum_func_status                ret;
        zval                                    *row = (zval *) param;
-       php_mysql_packet_row    *row_packet = result->row_packet;
+       MYSQLND_PACKET_ROW      *row_packet = result->row_packet;
 
        DBG_ENTER("mysqlnd_fetch_row_unbuffered");
        DBG_INF_FMT("flags=%d", flags);
@@ -1053,7 +1053,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND * const conn, MYSQL
                                                                                                        zend_bool to_cache TSRMLS_DC)
 {
        enum_func_status ret;
-       php_mysql_packet_row *row_packet;
+       MYSQLND_PACKET_ROW *row_packet;
        unsigned int next_extend = STORE_RESULT_PREALLOCATED_SET_IF_NOT_EMPTY, free_rows = 1;
        MYSQLND_RES_BUFFERED *set;
 

diff --git a/ext/mysqlnd/mysqlnd_result_meta.c b/ext/mysqlnd/mysqlnd_result_meta.c
index e545c004b375ee3c5f1fc645ca65a75d4d98193f..d67aeb286cf30a16f8bc0025955238e764c197f2 100644 (file)
--- a/ext/mysqlnd/mysqlnd_result_meta.c
+++ b/ext/mysqlnd/mysqlnd_result_meta.c
@@ -142,7 +142,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const met
                                                                                                MYSQLND *conn TSRMLS_DC)
 {
        unsigned int i = 0;
-       php_mysql_packet_res_field * field_packet;
+       MYSQLND_PACKET_RES_FIELD * field_packet;
 #if PHP_MAJOR_VERSION >= 6
        UChar *ustr;
        int ulen;

diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index 65611cce585f1376c90656cb9e0f127ef5f44fad..4452ab93b1aa81d48fa195a302adc666e88a741e 100644 (file)
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -251,32 +251,32 @@ struct st_mysqlnd_net_methods
 };
 
 
-struct st_php_mysql_packet_greet;
-struct st_php_mysql_packet_greet;
-struct st_php_mysql_packet_auth;
-struct st_php_mysql_packet_ok;
-struct st_php_mysql_packet_command;
-struct st_php_mysql_packet_eof;
-struct st_php_mysql_packet_rset_header;
-struct st_php_mysql_packet_res_field;
-struct st_php_mysql_packet_row;
-struct st_php_mysql_packet_stats;
-struct st_php_mysql_packet_prepare_response;
-struct st_php_mysql_packet_chg_user_resp;
+struct st_mysqlnd_packet_greet;
+struct st_mysqlnd_packet_greet;
+struct st_mysqlnd_packet_auth;
+struct st_mysqlnd_packet_ok;
+struct st_mysqlnd_packet_command;
+struct st_mysqlnd_packet_eof;
+struct st_mysqlnd_packet_rset_header;
+struct st_mysqlnd_packet_res_field;
+struct st_mysqlnd_packet_row;
+struct st_mysqlnd_packet_stats;
+struct st_mysqlnd_packet_prepare_response;
+struct st_mysqlnd_packet_chg_user_resp;
 
 struct st_mysqlnd_protocol_methods
 {
-       struct st_php_mysql_packet_greet *              (*get_greet_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
-       struct st_php_mysql_packet_auth *               (*get_auth_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
-       struct st_php_mysql_packet_ok *                 (*get_ok_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
-       struct st_php_mysql_packet_command *    (*get_command_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
-       struct st_php_mysql_packet_eof *                (*get_eof_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
-       struct st_php_mysql_packet_rset_header *(*get_rset_header_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
-       struct st_php_mysql_packet_res_field *  (*get_result_field_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
-       struct st_php_mysql_packet_row *                (*get_row_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
-       struct st_php_mysql_packet_stats *              (*get_stats_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
-       struct st_php_mysql_packet_prepare_response *(*get_prepare_response_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
-       struct st_php_mysql_packet_chg_user_resp*(*get_change_user_response_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
+       struct st_mysqlnd_packet_greet *                (*get_greet_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
+       struct st_mysqlnd_packet_auth *         (*get_auth_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
+       struct st_mysqlnd_packet_ok *                   (*get_ok_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
+       struct st_mysqlnd_packet_command *      (*get_command_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
+       struct st_mysqlnd_packet_eof *          (*get_eof_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
+       struct st_mysqlnd_packet_rset_header *(*get_rset_header_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
+       struct st_mysqlnd_packet_res_field *    (*get_result_field_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
+       struct st_mysqlnd_packet_row *          (*get_row_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
+       struct st_mysqlnd_packet_stats *                (*get_stats_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
+       struct st_mysqlnd_packet_prepare_response *(*get_prepare_response_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
+       struct st_mysqlnd_packet_chg_user_resp*(*get_change_user_response_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC);
 };
 
 
@@ -341,8 +341,8 @@ struct st_mysqlnd_conn_methods
        enum mysqlnd_connection_state (*get_state)(MYSQLND * const conn TSRMLS_DC);
        void                            (*set_state)(MYSQLND * const conn, enum mysqlnd_connection_state new_state TSRMLS_DC);
 
-       enum_func_status        (*simple_command)(MYSQLND *conn, enum php_mysqlnd_server_command command, const char * const arg, size_t arg_len, enum php_mysql_packet_type ok_packet, zend_bool silent, zend_bool ignore_upsert_status TSRMLS_DC);
-       enum_func_status        (*simple_command_handle_response)(MYSQLND *conn, enum php_mysql_packet_type ok_packet, zend_bool silent, enum php_mysqlnd_server_command command, zend_bool ignore_upsert_status TSRMLS_DC);
+       enum_func_status        (*simple_command)(MYSQLND *conn, enum php_mysqlnd_server_command command, const char * const arg, size_t arg_len, enum mysqlnd_packet_type ok_packet, zend_bool silent, zend_bool ignore_upsert_status TSRMLS_DC);
+       enum_func_status        (*simple_command_handle_response)(MYSQLND *conn, enum mysqlnd_packet_type ok_packet, zend_bool silent, enum php_mysqlnd_server_command command, zend_bool ignore_upsert_status TSRMLS_DC);
 
        enum_func_status        (*restart_psession)(MYSQLND *conn TSRMLS_DC);
        enum_func_status        (*end_psession)(MYSQLND *conn TSRMLS_DC);
@@ -554,8 +554,6 @@ struct st_mysqlnd_connection
        struct st_mysqlnd_conn_methods *m;
 };
 
-typedef struct st_php_mysql_packet_row php_mysql_packet_row;
-
 
 struct mysqlnd_field_hash_key
 {
@@ -629,7 +627,7 @@ struct st_mysqlnd_res
        */
        unsigned long                   *lengths;
 
-       php_mysql_packet_row    *row_packet;
+       struct st_mysqlnd_packet_row * row_packet;
 
        MYSQLND_MEMORY_POOL * result_set_memory_pool;
 };

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index 87395055b13d8bd75a5d7cd41959064ab904a537..4332102f5a9dbfc4a2dda3efa851199206f84ad3 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -286,7 +286,7 @@ php_mysqlnd_greet_read(void *_packet, MYSQLND *conn TSRMLS_DC)
        zend_uchar buf[2048];
        zend_uchar *p = buf;
        zend_uchar *begin = buf;
-       php_mysql_packet_greet *packet= (php_mysql_packet_greet *) _packet;
+       MYSQLND_PACKET_GREET *packet= (MYSQLND_PACKET_GREET *) _packet;
 
        DBG_ENTER("php_mysqlnd_greet_read");
 
@@ -364,7 +364,7 @@ php_mysqlnd_greet_read(void *_packet, MYSQLND *conn TSRMLS_DC)
 static
 void php_mysqlnd_greet_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 {
-       php_mysql_packet_greet *p= (php_mysql_packet_greet *) _packet;
+       MYSQLND_PACKET_GREET *p= (MYSQLND_PACKET_GREET *) _packet;
        if (p->server_version) {
                mnd_efree(p->server_version);
                p->server_version = NULL;
@@ -431,7 +431,7 @@ size_t php_mysqlnd_auth_write(void *_packet, MYSQLND *conn TSRMLS_DC)
        char buffer[1024];
        register char *p= buffer + MYSQLND_HEADER_SIZE; /* start after the header */
        int len;
-       register php_mysql_packet_auth *packet= (php_mysql_packet_auth *) _packet;
+       register MYSQLND_PACKET_AUTH *packet= (MYSQLND_PACKET_AUTH *) _packet;
 
        DBG_ENTER("php_mysqlnd_auth_write");
 
@@ -493,7 +493,7 @@ static
 void php_mysqlnd_auth_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 {
        if (!alloca) {
-               mnd_pefree((php_mysql_packet_auth *) _packet, ((php_mysql_packet_auth *)_packet)->header.persistent);
+               mnd_pefree((MYSQLND_PACKET_AUTH *) _packet, ((MYSQLND_PACKET_AUTH *)_packet)->header.persistent);
        }
 }
 /* }}} */
@@ -511,7 +511,7 @@ php_mysqlnd_ok_read(void *_packet, MYSQLND *conn TSRMLS_DC)
        zend_uchar *p = buf;
        zend_uchar *begin = buf;
        unsigned long i;
-       register php_mysql_packet_ok *packet= (php_mysql_packet_ok *) _packet;
+       register MYSQLND_PACKET_OK *packet= (MYSQLND_PACKET_OK *) _packet;
 
        DBG_ENTER("php_mysqlnd_ok_read");
 
@@ -565,7 +565,7 @@ php_mysqlnd_ok_read(void *_packet, MYSQLND *conn TSRMLS_DC)
 static
 void php_mysqlnd_ok_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 {
-       php_mysql_packet_ok *p= (php_mysql_packet_ok *) _packet;
+       MYSQLND_PACKET_OK *p= (MYSQLND_PACKET_OK *) _packet;
        if (p->message) {
                mnd_efree(p->message);
                p->message = NULL;
@@ -587,7 +587,7 @@ php_mysqlnd_eof_read(void *_packet, MYSQLND *conn TSRMLS_DC)
 
          Error : error_code + '#' + sqlstate + MYSQLND_ERRMSG_SIZE
        */
-       php_mysql_packet_eof *packet= (php_mysql_packet_eof *) _packet;
+       MYSQLND_PACKET_EOF *packet= (MYSQLND_PACKET_EOF *) _packet;
        size_t buf_len = conn->net->cmd_buffer.length;
        zend_uchar *buf = (zend_uchar *) conn->net->cmd_buffer.buffer;
        zend_uchar *p = buf;
@@ -643,7 +643,7 @@ static
 void php_mysqlnd_eof_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 {
        if (!alloca) {
-               mnd_pefree(_packet, ((php_mysql_packet_eof *)_packet)->header.persistent);
+               mnd_pefree(_packet, ((MYSQLND_PACKET_EOF *)_packet)->header.persistent);
        }
 }
 /* }}} */
@@ -653,7 +653,7 @@ void php_mysqlnd_eof_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 size_t php_mysqlnd_cmd_write(void *_packet, MYSQLND *conn TSRMLS_DC)
 {
        /* Let's have some space, which we can use, if not enough, we will allocate new buffer */
-       php_mysql_packet_command *packet= (php_mysql_packet_command *) _packet;
+       MYSQLND_PACKET_COMMAND *packet= (MYSQLND_PACKET_COMMAND *) _packet;
        MYSQLND_NET *net = conn->net;
        unsigned int error_reporting = EG(error_reporting);
        size_t written;
@@ -713,7 +713,7 @@ static
 void php_mysqlnd_cmd_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 {
        if (!alloca) {
-               mnd_pefree(_packet, ((php_mysql_packet_command *)_packet)->header.persistent);
+               mnd_pefree(_packet, ((MYSQLND_PACKET_COMMAND *)_packet)->header.persistent);
        }
 }
 /* }}} */
@@ -728,7 +728,7 @@ php_mysqlnd_rset_header_read(void *_packet, MYSQLND *conn TSRMLS_DC)
        zend_uchar *p = buf;
        zend_uchar *begin = buf;
        size_t len;
-       php_mysql_packet_rset_header *packet= (php_mysql_packet_rset_header *) _packet;
+       MYSQLND_PACKET_RSET_HEADER *packet= (MYSQLND_PACKET_RSET_HEADER *) _packet;
 
        DBG_ENTER("php_mysqlnd_rset_header_read");
 
@@ -801,7 +801,7 @@ php_mysqlnd_rset_header_read(void *_packet, MYSQLND *conn TSRMLS_DC)
 static
 void php_mysqlnd_rset_header_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 {
-       php_mysql_packet_rset_header *p= (php_mysql_packet_rset_header *) _packet;
+       MYSQLND_PACKET_RSET_HEADER *p= (MYSQLND_PACKET_RSET_HEADER *) _packet;
        DBG_ENTER("php_mysqlnd_rset_header_free_mem");
        if (p->info_or_local_file) {
                mnd_efree(p->info_or_local_file);
@@ -836,7 +836,7 @@ static enum_func_status
 php_mysqlnd_rset_field_read(void *_packet, MYSQLND *conn TSRMLS_DC)
 {
        /* Should be enough for the metadata of a single row */
-       php_mysql_packet_res_field *packet= (php_mysql_packet_res_field *) _packet;
+       MYSQLND_PACKET_RES_FIELD *packet= (MYSQLND_PACKET_RES_FIELD *) _packet;
        size_t buf_len = conn->net->cmd_buffer.length, total_len = 0;
        zend_uchar *buf = (zend_uchar *) conn->net->cmd_buffer.buffer;
        zend_uchar *p = buf;
@@ -1005,7 +1005,7 @@ faulty_or_fake:
 static
 void php_mysqlnd_rset_field_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 {
-       php_mysql_packet_res_field *p= (php_mysql_packet_res_field *) _packet;
+       MYSQLND_PACKET_RES_FIELD *p= (MYSQLND_PACKET_RES_FIELD *) _packet;
 
        /* p->metadata was passed to us as temporal buffer */
        if (!alloca) {
@@ -1411,7 +1411,7 @@ php_mysqlnd_rowp_read(void *_packet, MYSQLND *conn TSRMLS_DC)
        zend_uchar *p;
        enum_func_status ret = PASS;
        size_t old_chunk_size = net->stream->chunk_size;
-       php_mysql_packet_row *packet= (php_mysql_packet_row *) _packet;
+       MYSQLND_PACKET_ROW *packet= (MYSQLND_PACKET_ROW *) _packet;
        size_t post_alloc_for_bit_fields = 0;
        uint64_t data_size = 0;
 
@@ -1504,10 +1504,10 @@ end:
 static
 void php_mysqlnd_rowp_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 {
-       php_mysql_packet_row *p;
+       MYSQLND_PACKET_ROW *p;
 
        DBG_ENTER("php_mysqlnd_rowp_free_mem");
-       p = (php_mysql_packet_row *) _packet;
+       p = (MYSQLND_PACKET_ROW *) _packet;
        if (p->row_buffer) {
                p->row_buffer->free_chunk(p->row_buffer, TRUE TSRMLS_CC);
                p->row_buffer = NULL;
@@ -1532,7 +1532,7 @@ void php_mysqlnd_rowp_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 static enum_func_status
 php_mysqlnd_stats_read(void *_packet, MYSQLND *conn TSRMLS_DC)
 {
-       php_mysql_packet_stats *packet= (php_mysql_packet_stats *) _packet;
+       MYSQLND_PACKET_STATS *packet= (MYSQLND_PACKET_STATS *) _packet;
        size_t buf_len = conn->net->cmd_buffer.length;
        zend_uchar *buf = (zend_uchar *) conn->net->cmd_buffer.buffer;
 
@@ -1554,7 +1554,7 @@ php_mysqlnd_stats_read(void *_packet, MYSQLND *conn TSRMLS_DC)
 static
 void php_mysqlnd_stats_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 {
-       php_mysql_packet_stats *p= (php_mysql_packet_stats *) _packet;
+       MYSQLND_PACKET_STATS *p= (MYSQLND_PACKET_STATS *) _packet;
        if (p->message) {
                mnd_efree(p->message);
                p->message = NULL;
@@ -1580,7 +1580,7 @@ php_mysqlnd_prepare_read(void *_packet, MYSQLND *conn TSRMLS_DC)
        zend_uchar *p = buf;
        zend_uchar *begin = buf;
        unsigned int data_size;
-       php_mysql_packet_prepare_response *packet= (php_mysql_packet_prepare_response *) _packet;
+       MYSQLND_PACKET_PREPARE_RESPONSE *packet= (MYSQLND_PACKET_PREPARE_RESPONSE *) _packet;
 
        DBG_ENTER("php_mysqlnd_prepare_read");
 
@@ -1643,7 +1643,7 @@ php_mysqlnd_prepare_read(void *_packet, MYSQLND *conn TSRMLS_DC)
 static
 void php_mysqlnd_prepare_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 {
-       php_mysql_packet_prepare_response *p= (php_mysql_packet_prepare_response *) _packet;
+       MYSQLND_PACKET_PREPARE_RESPONSE *p= (MYSQLND_PACKET_PREPARE_RESPONSE *) _packet;
        if (!alloca) {
                mnd_pefree(p, p->header.persistent);
        }
@@ -1660,11 +1660,11 @@ php_mysqlnd_chg_user_read(void *_packet, MYSQLND *conn TSRMLS_DC)
        zend_uchar *buf = (zend_uchar *) conn->net->cmd_buffer.buffer;
        zend_uchar *p = buf;
        zend_uchar *begin = buf;
-       php_mysql_packet_chg_user_resp *packet= (php_mysql_packet_chg_user_resp *) _packet;
+       MYSQLND_PACKET_CHG_USER_RESPONSE *packet= (MYSQLND_PACKET_CHG_USER_RESPONSE *) _packet;
 
        DBG_ENTER("php_mysqlnd_chg_user_read");
 
-       PACKET_READ_HEADER_AND_BODY(packet, conn, buf, buf_len, "change user response", PROT_CHG_USER_PACKET);
+       PACKET_READ_HEADER_AND_BODY(packet, conn, buf, buf_len, "change user response", PROT_CHG_USER_RESP_PACKET);
 
        /*
          Don't increment. First byte is ERROR_MARKER on error, but otherwise is starting byte
@@ -1704,7 +1704,7 @@ static
 void php_mysqlnd_chg_user_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 {
        if (!alloca) {
-               mnd_pefree(_packet, ((php_mysql_packet_chg_user_resp *)_packet)->header.persistent);
+               mnd_pefree(_packet, ((MYSQLND_PACKET_CHG_USER_RESPONSE *)_packet)->header.persistent);
        }
 }
 /* }}} */
@@ -1716,81 +1716,81 @@ static
 mysqlnd_packet_methods packet_methods[PROT_LAST] =
 {
        {
-               sizeof(php_mysql_packet_greet),
+               sizeof(MYSQLND_PACKET_GREET),
                php_mysqlnd_greet_read,
                NULL, /* write */
                php_mysqlnd_greet_free_mem,
        }, /* PROT_GREET_PACKET */
        {
-               sizeof(php_mysql_packet_auth),
+               sizeof(MYSQLND_PACKET_AUTH),
                NULL, /* read */
                php_mysqlnd_auth_write,
                php_mysqlnd_auth_free_mem,
        }, /* PROT_AUTH_PACKET */
        {
-               sizeof(php_mysql_packet_ok),
+               sizeof(MYSQLND_PACKET_OK),
                php_mysqlnd_ok_read, /* read */
                NULL, /* write */
                php_mysqlnd_ok_free_mem,
        }, /* PROT_OK_PACKET */
        {
-               sizeof(php_mysql_packet_eof),
+               sizeof(MYSQLND_PACKET_EOF),
                php_mysqlnd_eof_read, /* read */
                NULL, /* write */
                php_mysqlnd_eof_free_mem,
        }, /* PROT_EOF_PACKET */
        {
-               sizeof(php_mysql_packet_command),
+               sizeof(MYSQLND_PACKET_COMMAND),
                NULL, /* read */
                php_mysqlnd_cmd_write, /* write */
                php_mysqlnd_cmd_free_mem,
        }, /* PROT_CMD_PACKET */
        {
-               sizeof(php_mysql_packet_rset_header),
+               sizeof(MYSQLND_PACKET_RSET_HEADER),
                php_mysqlnd_rset_header_read, /* read */
                NULL, /* write */
                php_mysqlnd_rset_header_free_mem,
        }, /* PROT_RSET_HEADER_PACKET */
        {
-               sizeof(php_mysql_packet_res_field),
+               sizeof(MYSQLND_PACKET_RES_FIELD),
                php_mysqlnd_rset_field_read, /* read */
                NULL, /* write */
                php_mysqlnd_rset_field_free_mem,
        }, /* PROT_RSET_FLD_PACKET */
        {
-               sizeof(php_mysql_packet_row),
+               sizeof(MYSQLND_PACKET_ROW),
                php_mysqlnd_rowp_read, /* read */
                NULL, /* write */
                php_mysqlnd_rowp_free_mem,
        }, /* PROT_ROW_PACKET */
        {
-               sizeof(php_mysql_packet_stats),
+               sizeof(MYSQLND_PACKET_STATS),
                php_mysqlnd_stats_read, /* read */
                NULL, /* write */
                php_mysqlnd_stats_free_mem,
        }, /* PROT_STATS_PACKET */
        {
-               sizeof(php_mysql_packet_prepare_response),
+               sizeof(MYSQLND_PACKET_PREPARE_RESPONSE),
                php_mysqlnd_prepare_read, /* read */
                NULL, /* write */
                php_mysqlnd_prepare_free_mem,
        }, /* PROT_PREPARE_RESP_PACKET */
        {
-               sizeof(php_mysql_packet_chg_user_resp),
+               sizeof(MYSQLND_PACKET_CHG_USER_RESPONSE),
                php_mysqlnd_chg_user_read, /* read */
                NULL, /* write */
                php_mysqlnd_chg_user_free_mem,
-       } /* PROT_CHG_USER_PACKET */
+       } /* PROT_CHG_USER_RESP_PACKET */
 };
 /* }}} */
 
 
 
 /* {{{ mysqlnd_protocol::get_greet_packet */
-static struct st_php_mysql_packet_greet *
+static struct st_mysqlnd_packet_greet *
 MYSQLND_METHOD(mysqlnd_protocol, get_greet_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC)
 {
-       struct st_php_mysql_packet_greet * packet = pecalloc(1, packet_methods[PROT_GREET_PACKET].struct_size, persistent);
+       struct st_mysqlnd_packet_greet * packet = pecalloc(1, packet_methods[PROT_GREET_PACKET].struct_size, persistent);
        DBG_ENTER("mysqlnd_protocol::get_greet_packet");
        packet->header.m = &packet_methods[PROT_GREET_PACKET];
        packet->header.persistent = persistent;
@@ -1800,10 +1800,10 @@ MYSQLND_METHOD(mysqlnd_protocol, get_greet_packet)(MYSQLND_PROTOCOL * const prot
 
 
 /* {{{ mysqlnd_protocol::get_auth_packet */
-static struct st_php_mysql_packet_auth *
+static struct st_mysqlnd_packet_auth *
 MYSQLND_METHOD(mysqlnd_protocol, get_auth_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC)
 {
-       struct st_php_mysql_packet_auth * packet = pecalloc(1, packet_methods[PROT_AUTH_PACKET].struct_size, persistent);
+       struct st_mysqlnd_packet_auth * packet = pecalloc(1, packet_methods[PROT_AUTH_PACKET].struct_size, persistent);
        DBG_ENTER("mysqlnd_protocol::get_auth_packet");
        packet->header.m = &packet_methods[PROT_AUTH_PACKET];
        packet->header.persistent = persistent;
@@ -1813,10 +1813,10 @@ MYSQLND_METHOD(mysqlnd_protocol, get_auth_packet)(MYSQLND_PROTOCOL * const proto
 
 
 /* {{{ mysqlnd_protocol::get_ok_packet */
-static struct st_php_mysql_packet_ok *
+static struct st_mysqlnd_packet_ok *
 MYSQLND_METHOD(mysqlnd_protocol, get_ok_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC)
 {
-       struct st_php_mysql_packet_ok * packet = pecalloc(1, packet_methods[PROT_OK_PACKET].struct_size, persistent);
+       struct st_mysqlnd_packet_ok * packet = pecalloc(1, packet_methods[PROT_OK_PACKET].struct_size, persistent);
        DBG_ENTER("mysqlnd_protocol::get_ok_packet");
        packet->header.m = &packet_methods[PROT_OK_PACKET];
        packet->header.persistent = persistent;
@@ -1826,10 +1826,10 @@ MYSQLND_METHOD(mysqlnd_protocol, get_ok_packet)(MYSQLND_PROTOCOL * const protoco
 
 
 /* {{{ mysqlnd_protocol::get_eof_packet */
-static struct st_php_mysql_packet_eof *
+static struct st_mysqlnd_packet_eof *
 MYSQLND_METHOD(mysqlnd_protocol, get_eof_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC)
 {
-       struct st_php_mysql_packet_eof * packet = pecalloc(1, packet_methods[PROT_EOF_PACKET].struct_size, persistent);
+       struct st_mysqlnd_packet_eof * packet = pecalloc(1, packet_methods[PROT_EOF_PACKET].struct_size, persistent);
        DBG_ENTER("mysqlnd_protocol::get_eof_packet");
        packet->header.m = &packet_methods[PROT_EOF_PACKET];
        packet->header.persistent = persistent;
@@ -1839,10 +1839,10 @@ MYSQLND_METHOD(mysqlnd_protocol, get_eof_packet)(MYSQLND_PROTOCOL * const protoc
 
 
 /* {{{ mysqlnd_protocol::get_command_packet */
-static struct st_php_mysql_packet_command *
+static struct st_mysqlnd_packet_command *
 MYSQLND_METHOD(mysqlnd_protocol, get_command_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC)
 {
-       struct st_php_mysql_packet_command * packet = pecalloc(1, packet_methods[PROT_CMD_PACKET].struct_size, persistent);
+       struct st_mysqlnd_packet_command * packet = pecalloc(1, packet_methods[PROT_CMD_PACKET].struct_size, persistent);
        DBG_ENTER("mysqlnd_protocol::get_command_packet");
        packet->header.m = &packet_methods[PROT_CMD_PACKET];
        packet->header.persistent = persistent;
@@ -1852,10 +1852,10 @@ MYSQLND_METHOD(mysqlnd_protocol, get_command_packet)(MYSQLND_PROTOCOL * const pr
 
 
 /* {{{ mysqlnd_protocol::get_rset_packet */
-static struct st_php_mysql_packet_rset_header *
+static struct st_mysqlnd_packet_rset_header *
 MYSQLND_METHOD(mysqlnd_protocol, get_rset_header_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC)
 {
-       struct st_php_mysql_packet_rset_header * packet = pecalloc(1, packet_methods[PROT_RSET_HEADER_PACKET].struct_size, persistent);
+       struct st_mysqlnd_packet_rset_header * packet = pecalloc(1, packet_methods[PROT_RSET_HEADER_PACKET].struct_size, persistent);
        DBG_ENTER("mysqlnd_protocol::get_rset_header_packet");
        packet->header.m = &packet_methods[PROT_RSET_HEADER_PACKET];
        packet->header.persistent = persistent;
@@ -1865,10 +1865,10 @@ MYSQLND_METHOD(mysqlnd_protocol, get_rset_header_packet)(MYSQLND_PROTOCOL * cons
 
 
 /* {{{ mysqlnd_protocol::get_result_field_packet */
-static struct st_php_mysql_packet_res_field *
+static struct st_mysqlnd_packet_res_field *
 MYSQLND_METHOD(mysqlnd_protocol, get_result_field_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC)
 {
-       struct st_php_mysql_packet_res_field * packet = pecalloc(1, packet_methods[PROT_RSET_FLD_PACKET].struct_size, persistent);
+       struct st_mysqlnd_packet_res_field * packet = pecalloc(1, packet_methods[PROT_RSET_FLD_PACKET].struct_size, persistent);
        DBG_ENTER("mysqlnd_protocol::get_result_field_packet");
        packet->header.m = &packet_methods[PROT_RSET_FLD_PACKET];
        packet->header.persistent = persistent;
@@ -1878,10 +1878,10 @@ MYSQLND_METHOD(mysqlnd_protocol, get_result_field_packet)(MYSQLND_PROTOCOL * con
 
 
 /* {{{ mysqlnd_protocol::get_row_packet */
-static struct st_php_mysql_packet_row *
+static struct st_mysqlnd_packet_row *
 MYSQLND_METHOD(mysqlnd_protocol, get_row_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC)
 {
-       struct st_php_mysql_packet_row * packet = pecalloc(1, packet_methods[PROT_ROW_PACKET].struct_size, persistent);
+       struct st_mysqlnd_packet_row * packet = pecalloc(1, packet_methods[PROT_ROW_PACKET].struct_size, persistent);
        DBG_ENTER("mysqlnd_protocol::get_row_packet");
        packet->header.m = &packet_methods[PROT_ROW_PACKET];
        packet->header.persistent = persistent;
@@ -1891,10 +1891,10 @@ MYSQLND_METHOD(mysqlnd_protocol, get_row_packet)(MYSQLND_PROTOCOL * const protoc
 
 
 /* {{{ mysqlnd_protocol::get_stats_packet */
-static struct st_php_mysql_packet_stats *
+static struct st_mysqlnd_packet_stats *
 MYSQLND_METHOD(mysqlnd_protocol, get_stats_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC)
 {
-       struct st_php_mysql_packet_stats * packet = pecalloc(1, packet_methods[PROT_STATS_PACKET].struct_size, persistent);
+       struct st_mysqlnd_packet_stats * packet = pecalloc(1, packet_methods[PROT_STATS_PACKET].struct_size, persistent);
        DBG_ENTER("mysqlnd_protocol::get_stats_packet");
        packet->header.m = &packet_methods[PROT_STATS_PACKET];
        packet->header.persistent = persistent;
@@ -1904,10 +1904,10 @@ MYSQLND_METHOD(mysqlnd_protocol, get_stats_packet)(MYSQLND_PROTOCOL * const prot
 
 
 /* {{{ mysqlnd_protocol::get_prepare_response_packet */
-static struct st_php_mysql_packet_prepare_response *
+static struct st_mysqlnd_packet_prepare_response *
 MYSQLND_METHOD(mysqlnd_protocol, get_prepare_response_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC)
 {
-       struct st_php_mysql_packet_prepare_response * packet = pecalloc(1, packet_methods[PROT_PREPARE_RESP_PACKET].struct_size, persistent);
+       struct st_mysqlnd_packet_prepare_response * packet = pecalloc(1, packet_methods[PROT_PREPARE_RESP_PACKET].struct_size, persistent);
        DBG_ENTER("mysqlnd_protocol::get_prepare_response_packet");
        packet->header.m = &packet_methods[PROT_PREPARE_RESP_PACKET];
        packet->header.persistent = persistent;
@@ -1917,12 +1917,12 @@ MYSQLND_METHOD(mysqlnd_protocol, get_prepare_response_packet)(MYSQLND_PROTOCOL *
 
 
 /* {{{ mysqlnd_protocol::get_change_user_response_packet */
-static struct st_php_mysql_packet_chg_user_resp*
+static struct st_mysqlnd_packet_chg_user_resp*
 MYSQLND_METHOD(mysqlnd_protocol, get_change_user_response_packet)(MYSQLND_PROTOCOL * const protocol, zend_bool persistent TSRMLS_DC)
 {
-       struct st_php_mysql_packet_chg_user_resp * packet = pecalloc(1, packet_methods[PROT_CHG_USER_PACKET].struct_size, persistent);
+       struct st_mysqlnd_packet_chg_user_resp * packet = pecalloc(1, packet_methods[PROT_CHG_USER_RESP_PACKET].struct_size, persistent);
        DBG_ENTER("mysqlnd_protocol::get_change_user_response_packet");
-       packet->header.m = &packet_methods[PROT_CHG_USER_PACKET];
+       packet->header.m = &packet_methods[PROT_CHG_USER_RESP_PACKET];
        packet->header.persistent = persistent;
        DBG_RETURN(packet);
 }

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h
index 34ae7ea91693ed2d378a544eefd1e3d0029bf555..9ca182ded81bbbb484f365fb5f2d138d11c552dd 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.h
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.h
@@ -63,7 +63,7 @@ typedef struct st_mysqlnd_packet_header {
 } mysqlnd_packet_header;
 
 /* Server greets the client */
-typedef struct st_php_mysql_packet_greet {
+typedef struct st_mysqlnd_packet_greet {
        mysqlnd_packet_header           header;
        uint8_t         protocol_version;
        char            *server_version;
@@ -79,11 +79,11 @@ typedef struct st_php_mysql_packet_greet {
        char            error[MYSQLND_ERRMSG_SIZE+1];
        char            sqlstate[MYSQLND_SQLSTATE_LENGTH + 1];
        unsigned int    error_no;
-} php_mysql_packet_greet;
+} MYSQLND_PACKET_GREET;
 
 
 /* Client authenticates */
-typedef struct st_php_mysql_packet_auth {
+typedef struct st_mysqlnd_packet_auth {
        mysqlnd_packet_header           header;
        uint32_t        client_flags;
        uint32_t        max_packet_size;
@@ -99,10 +99,10 @@ typedef struct st_php_mysql_packet_auth {
        /* +1 for \0 because of scramble() */
        unsigned char   *server_scramble_buf;
        size_t                  db_len;
-} php_mysql_packet_auth;
+} MYSQLND_PACKET_AUTH;
 
 /* OK packet */
-typedef struct st_php_mysql_packet_ok {
+typedef struct st_mysqlnd_packet_ok {
        mysqlnd_packet_header           header;
        uint8_t         field_count; /* always 0x0 */
        uint64_t        affected_rows;
@@ -115,20 +115,20 @@ typedef struct st_php_mysql_packet_ok {
        char            error[MYSQLND_ERRMSG_SIZE+1];
        char            sqlstate[MYSQLND_SQLSTATE_LENGTH + 1];
        unsigned int    error_no;
-} php_mysql_packet_ok;
+} MYSQLND_PACKET_OK;
 
 
 /* Command packet */
-typedef struct st_php_mysql_packet_command {
+typedef struct st_mysqlnd_packet_command {
        mysqlnd_packet_header                   header;
        enum php_mysqlnd_server_command command;
        const char                                              *argument;
        size_t                                                  arg_len;
-} php_mysql_packet_command;
+} MYSQLND_PACKET_COMMAND;
 
 
 /* EOF packet */
-typedef struct st_php_mysql_packet_eof {
+typedef struct st_mysqlnd_packet_eof {
        mysqlnd_packet_header           header;
        uint8_t         field_count; /* 0xFE */
        uint16_t        warning_count;
@@ -137,12 +137,12 @@ typedef struct st_php_mysql_packet_eof {
        char            error[MYSQLND_ERRMSG_SIZE+1];
        char            sqlstate[MYSQLND_SQLSTATE_LENGTH + 1];
        unsigned int    error_no;
-} php_mysql_packet_eof;
+} MYSQLND_PACKET_EOF;
 /* EOF packet */
 
 
 /* Result Set header*/
-typedef struct st_php_mysql_packet_rset_header {
+typedef struct st_mysqlnd_packet_rset_header {
        mysqlnd_packet_header           header;
        /*
          0x00 => ok
@@ -164,11 +164,11 @@ typedef struct st_php_mysql_packet_rset_header {
        size_t          info_or_local_file_len;
        /* If error packet, we use these */
        MYSQLND_ERROR_INFO      error_info;
-} php_mysql_packet_rset_header;
+} MYSQLND_PACKET_RSET_HEADER;
 
 
 /* Result set field packet */
-typedef struct st_php_mysql_packet_res_field {
+typedef struct st_mysqlnd_packet_res_field {
        mysqlnd_packet_header   header;
        MYSQLND_FIELD                   *metadata;
        /* For table definitions, empty for result sets */
@@ -176,11 +176,11 @@ typedef struct st_php_mysql_packet_res_field {
        zend_bool                               stupid_list_fields_eof;
 
        MYSQLND_ERROR_INFO              error_info;
-} php_mysql_packet_res_field;
+} MYSQLND_PACKET_RES_FIELD;
 
 
 /* Row packet */
-struct st_php_mysql_packet_row {
+typedef struct st_mysqlnd_packet_row {
        mysqlnd_packet_header   header;
        zval            **fields;
        uint32_t        field_count;
@@ -205,20 +205,20 @@ struct st_php_mysql_packet_row {
 
        /* If error packet, we use these */
        MYSQLND_ERROR_INFO      error_info;
-};
+} MYSQLND_PACKET_ROW;
 
 
 /* Statistics packet */
-typedef struct st_php_mysql_packet_stats {
+typedef struct st_mysqlnd_packet_stats {
        mysqlnd_packet_header   header;
        char *message;
        /* message_len is not part of the packet*/
        size_t message_len;
-} php_mysql_packet_stats;
+} MYSQLND_PACKET_STATS;
 
 
 /* COM_PREPARE response packet */
-typedef struct st_php_mysql_packet_prepare_response {
+typedef struct st_mysqlnd_packet_prepare_response {
        mysqlnd_packet_header   header;
        /* also known as field_count 0x00=OK , 0xFF=error */
        unsigned char   error_code;
@@ -229,11 +229,11 @@ typedef struct st_php_mysql_packet_prepare_response {
 
        /* present in case of error */
        MYSQLND_ERROR_INFO      error_info;
-} php_mysql_packet_prepare_response;
+} MYSQLND_PACKET_PREPARE_RESPONSE;
 
 
 /* Statistics packet */
-typedef struct st_php_mysql_packet_chg_user_resp {
+typedef struct st_mysqlnd_packet_chg_user_resp {
        mysqlnd_packet_header   header;
        uint32_t                        field_count;
 
@@ -241,7 +241,7 @@ typedef struct st_php_mysql_packet_chg_user_resp {
        uint16_t                        server_capabilities;
        /* If error packet, we use these */
        MYSQLND_ERROR_INFO      error_info;
-} php_mysql_packet_chg_user_resp;
+} MYSQLND_PACKET_CHG_USER_RESPONSE;
 
 
 size_t mysqlnd_stream_write_w_header(MYSQLND * const conn, char * const buf, size_t count TSRMLS_DC);