From 066dad5ff92d32238e31ad57591b1ce43b2e032e Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Wed, 23 Dec 2009 11:58:45 +0000 Subject: [PATCH] Unify. The typedef-ed structs in mysqlnd are always capitalized. --- ext/mysqli/mysqli_api.c | 2 +- ext/mysqli/mysqli_nonapi.c | 2 +- ext/mysqlnd/mysqlnd_structs.h | 14 +++++++------- ext/mysqlnd/mysqlnd_wireprotocol.h | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 35f46eccd1..1f3c154512 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1815,7 +1815,7 @@ PHP_FUNCTION(mysqli_prepare) memcpy(last_error, stmt->stmt->last_error, MYSQL_ERRMSG_SIZE); memcpy(sqlstate, mysql->mysql->net.sqlstate, SQLSTATE_LENGTH+1); #else - mysqlnd_error_info error_info = mysql->mysql->error_info; + MYSQLND_ERROR_INFO error_info = mysql->mysql->error_info; #endif mysqli_stmt_close(stmt->stmt, FALSE); stmt->stmt = NULL; diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 30a6d601ef..72afb2070e 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -491,7 +491,7 @@ PHP_FUNCTION(mysqli_multi_query) strcpy(s_sqlstate, mysql_sqlstate(mysql->mysql)); s_errno = mysql_errno(mysql->mysql); #else - mysqlnd_error_info error_info = mysql->mysql->error_info; + MYSQLND_ERROR_INFO error_info = mysql->mysql->error_info; #endif MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql); MYSQLI_DISABLE_MQ; diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index 96f46324ea..7a85eecc07 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -96,7 +96,7 @@ typedef struct st_mysqlnd_upsert_result unsigned int server_status; uint64_t affected_rows; uint64_t last_insert_id; -} mysqlnd_upsert_status; +} MYSQLND_UPSERT_STATUS; typedef struct st_mysqlnd_error_info @@ -104,7 +104,7 @@ typedef struct st_mysqlnd_error_info char error[MYSQLND_ERRMSG_SIZE+1]; char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1]; unsigned int error_no; -} mysqlnd_error_info; +} MYSQLND_ERROR_INFO; typedef struct st_mysqlnd_infile_info @@ -465,12 +465,12 @@ struct st_mysqlnd_connection unsigned long server_capabilities; /* For UPSERT queries */ - mysqlnd_upsert_status upsert_status; + MYSQLND_UPSERT_STATUS upsert_status; char *last_message; unsigned int last_message_len; /* If error packet, we use these */ - mysqlnd_error_info error_info; + MYSQLND_ERROR_INFO error_info; /* To prevent queries during unbuffered fetches. Also to @@ -544,7 +544,7 @@ struct st_mysqlnd_buffered_result unsigned int references; - mysqlnd_error_info error_info; + MYSQLND_ERROR_INFO error_info; }; @@ -615,9 +615,9 @@ struct st_mysqlnd_stmt MYSQLND_RESULT_BIND *result_bind; zend_bool result_zvals_separated_once; - mysqlnd_upsert_status upsert_status; + MYSQLND_UPSERT_STATUS upsert_status; - mysqlnd_error_info error_info; + MYSQLND_ERROR_INFO error_info; zend_bool update_max_length; unsigned long prefetch_rows; diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h index b3f0ab63d8..66622e5cc4 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.h +++ b/ext/mysqlnd/mysqlnd_wireprotocol.h @@ -181,7 +181,7 @@ typedef struct st_php_mysql_packet_rset_header { char *info_or_local_file; size_t info_or_local_file_len; /* If error packet, we use these */ - mysqlnd_error_info error_info; + MYSQLND_ERROR_INFO error_info; } php_mysql_packet_rset_header; @@ -193,7 +193,7 @@ typedef struct st_php_mysql_packet_res_field { zend_bool skip_parsing; zend_bool stupid_list_fields_eof; - mysqlnd_error_info error_info; + MYSQLND_ERROR_INFO error_info; } php_mysql_packet_res_field; @@ -222,7 +222,7 @@ struct st_php_mysql_packet_row { size_t bit_fields_total_len; /* trailing \0 not counted */ /* If error packet, we use these */ - mysqlnd_error_info error_info; + MYSQLND_ERROR_INFO error_info; }; @@ -246,7 +246,7 @@ typedef struct st_php_mysql_packet_prepare_response { unsigned int warning_count; /* present in case of error */ - mysqlnd_error_info error_info; + MYSQLND_ERROR_INFO error_info; } php_mysql_packet_prepare_response; @@ -258,7 +258,7 @@ typedef struct st_php_mysql_packet_chg_user_resp { /* message_len is not part of the packet*/ uint16_t server_capabilities; /* If error packet, we use these */ - mysqlnd_error_info error_info; + MYSQLND_ERROR_INFO error_info; } php_mysql_packet_chg_user_resp; -- 2.50.1