andrey Wed, 23 Dec 2009 11:58:45 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=292528
Log: Unify. The typedef-ed structs in mysqlnd are always capitalized. Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h U php/php-src/trunk/ext/mysqli/mysqli_api.c U php/php-src/trunk/ext/mysqli/mysqli_nonapi.c U php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2009-12-23 10:38:29 UTC (rev 292527) +++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2009-12-23 11:58:45 UTC (rev 292528) @@ -1760,7 +1760,7 @@ 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; Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c 2009-12-23 10:38:29 UTC (rev 292527) +++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c 2009-12-23 11:58:45 UTC (rev 292528) @@ -486,7 +486,7 @@ 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; Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2009-12-23 10:38:29 UTC (rev 292527) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2009-12-23 11:58:45 UTC (rev 292528) @@ -96,7 +96,7 @@ 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 @@ 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 @@ 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 @@ unsigned int references; - mysqlnd_error_info error_info; + MYSQLND_ERROR_INFO error_info; }; @@ -615,9 +615,9 @@ 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; Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h 2009-12-23 10:38:29 UTC (rev 292527) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h 2009-12-23 11:58:45 UTC (rev 292528) @@ -181,7 +181,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ /* 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; Modified: php/php-src/trunk/ext/mysqli/mysqli_api.c =================================================================== --- php/php-src/trunk/ext/mysqli/mysqli_api.c 2009-12-23 10:38:29 UTC (rev 292527) +++ php/php-src/trunk/ext/mysqli/mysqli_api.c 2009-12-23 11:58:45 UTC (rev 292528) @@ -1815,7 +1815,7 @@ 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; Modified: php/php-src/trunk/ext/mysqli/mysqli_nonapi.c =================================================================== --- php/php-src/trunk/ext/mysqli/mysqli_nonapi.c 2009-12-23 10:38:29 UTC (rev 292527) +++ php/php-src/trunk/ext/mysqli/mysqli_nonapi.c 2009-12-23 11:58:45 UTC (rev 292528) @@ -491,7 +491,7 @@ 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; Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h =================================================================== --- php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h 2009-12-23 10:38:29 UTC (rev 292527) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h 2009-12-23 11:58:45 UTC (rev 292528) @@ -96,7 +96,7 @@ 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 @@ 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 @@ 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 @@ unsigned int references; - mysqlnd_error_info error_info; + MYSQLND_ERROR_INFO error_info; }; @@ -615,9 +615,9 @@ 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; Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h =================================================================== --- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h 2009-12-23 10:38:29 UTC (rev 292527) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h 2009-12-23 11:58:45 UTC (rev 292528) @@ -181,7 +181,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ /* 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;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php