clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename a method so it doesn't clash with a global symbol - a function

Browse Source 
Fix compiler waring by extening the type of a variable
This commit is contained in:
Andrey Hristov 2010-10-05 17:03:50 +00:00
parent de69927b8e
commit 396402fc97
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/mysqlnd/mysqlnd.c
View File

@ -1391,14 +1391,14 @@ MYSQLND_METHOD(mysqlnd_conn, ping)(MYSQLND * const conn TSRMLS_DC)
/* }}} */ /* }}} */
/* {{{ mysqlnd_conn::stat */ /* {{{ mysqlnd_conn::statistic */
static enum_func_status static enum_func_status
MYSQLND_METHOD(mysqlnd_conn, stat)(MYSQLND * conn, char **message, unsigned int * message_len TSRMLS_DC) MYSQLND_METHOD(mysqlnd_conn, statistic)(MYSQLND * conn, char **message, unsigned int * message_len TSRMLS_DC)
{ {
enum_func_status ret; enum_func_status ret;
MYSQLND_PACKET_STATS * stats_header; MYSQLND_PACKET_STATS * stats_header;
DBG_ENTER("mysqlnd_conn::stat"); DBG_ENTER("mysqlnd_conn::statistic");
DBG_INF_FMT("conn=%llu", conn->thread_id); DBG_INF_FMT("conn=%llu", conn->thread_id);
ret = conn->m->simple_command(conn, COM_STATISTICS, NULL, 0, PROT_LAST, FALSE, TRUE TSRMLS_CC); ret = conn->m->simple_command(conn, COM_STATISTICS, NULL, 0, PROT_LAST, FALSE, TRUE TSRMLS_CC);
@ -1583,13 +1583,13 @@ MYSQLND_METHOD(mysqlnd_conn, close)(MYSQLND * conn, enum_connection_close_type c
STAT_CLOSE_IMPLICIT, STAT_CLOSE_IMPLICIT,
STAT_CLOSE_DISCONNECT STAT_CLOSE_DISCONNECT
}; };
enum_mysqlnd_collected_stats stat = close_type_to_stat_map[close_type]; enum_mysqlnd_collected_stats statistic = close_type_to_stat_map[close_type];
DBG_ENTER("mysqlnd_conn::close"); DBG_ENTER("mysqlnd_conn::close");
DBG_INF_FMT("conn=%llu", conn->thread_id); DBG_INF_FMT("conn=%llu", conn->thread_id);
if (conn->state >= CONN_READY) { if (conn->state >= CONN_READY) {
MYSQLND_INC_CONN_STATISTIC(conn->stats, stat); MYSQLND_INC_CONN_STATISTIC(conn->stats, statistic);
MYSQLND_DEC_CONN_STATISTIC(conn->stats, STAT_OPENED_CONNECTIONS); MYSQLND_DEC_CONN_STATISTIC(conn->stats, STAT_OPENED_CONNECTIONS);
if (conn->persistent) { if (conn->persistent) {
MYSQLND_DEC_CONN_STATISTIC(conn->stats, STAT_OPENED_PERSISTENT_CONNECTIONS); MYSQLND_DEC_CONN_STATISTIC(conn->stats, STAT_OPENED_PERSISTENT_CONNECTIONS);
@ -2279,7 +2279,7 @@ MYSQLND_CLASS_METHODS_START(mysqlnd_conn)
MYSQLND_METHOD(mysqlnd_conn, get_server_version), MYSQLND_METHOD(mysqlnd_conn, get_server_version),
MYSQLND_METHOD(mysqlnd_conn, get_server_info), MYSQLND_METHOD(mysqlnd_conn, get_server_info),
MYSQLND_METHOD(mysqlnd_conn, stat), MYSQLND_METHOD(mysqlnd_conn, statistic),
MYSQLND_METHOD(mysqlnd_conn, get_host_info), MYSQLND_METHOD(mysqlnd_conn, get_host_info),
MYSQLND_METHOD(mysqlnd_conn, get_proto_info), MYSQLND_METHOD(mysqlnd_conn, get_proto_info),
MYSQLND_METHOD(mysqlnd_conn, info), MYSQLND_METHOD(mysqlnd_conn, info),

6
ext/mysqlnd/mysqlnd_result.c
View File

@ -194,7 +194,7 @@ MYSQLND_METHOD(mysqlnd_res, free_buffered_data)(MYSQLND_RES * result TSRMLS_DC)
{ {
MYSQLND_RES_BUFFERED *set = result->stored_data; MYSQLND_RES_BUFFERED *set = result->stored_data;
unsigned int field_count = result->field_count; unsigned int field_count = result->field_count;
int row; int64_t row;
DBG_ENTER("mysqlnd_res::free_buffered_data"); DBG_ENTER("mysqlnd_res::free_buffered_data");
DBG_INF_FMT("Freeing "MYSQLND_LLU_SPEC" row(s)", set->row_count); DBG_INF_FMT("Freeing "MYSQLND_LLU_SPEC" row(s)", set->row_count);
@ -211,7 +211,7 @@ MYSQLND_METHOD(mysqlnd_res, free_buffered_data)(MYSQLND_RES * result TSRMLS_DC)
int col; int col;
if (current_row != NULL) { if (current_row != NULL) {
for (col = field_count - 1; col >= 0; --col) { for (col = (int64_t) field_count - 1; col >= 0; --col) {
if (current_row[col]) { if (current_row[col]) {
zend_bool copy_ctor_called; zend_bool copy_ctor_called;
mysqlnd_palloc_zval_ptr_dtor(&(current_row[col]), result->type, &copy_ctor_called TSRMLS_CC); mysqlnd_palloc_zval_ptr_dtor(&(current_row[col]), result->type, &copy_ctor_called TSRMLS_CC);
@ -1229,7 +1229,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND * const conn, MYSQL
ret = FAIL; ret = FAIL;
goto end; goto end;
} }
memset(set->data, 0, set->row_count * meta->field_count * sizeof(zval *)); memset(set->data, 0, (size_t)(set->row_count * meta->field_count * sizeof(zval *)));
} }
MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn->stats, MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn->stats,