diff options
| author | Andrey Hristov <andrey@php.net> | 2010-10-05 17:03:50 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-10-05 17:03:50 +0000 |
| commit | 25e84b6a238e5dac6108b6e031cd2c39529ff6f3 (patch) | |
| tree | 6766fdd99023d23b61e56521b22eb574e751a177 /ext/mysqlnd/mysqlnd.c | |
| parent | 3daf54ffa063c0f1d5ed20da3de3bcd241846649 (diff) | |
| download | php-git-25e84b6a238e5dac6108b6e031cd2c39529ff6f3.tar.gz | |
Rename a method so it doesn't clash with a global symbol - a function
Fix compiler waring by extening the type of a variable
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index ee046bf648..10e91e0937 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -1368,14 +1368,14 @@ MYSQLND_METHOD(mysqlnd_conn, ping)(MYSQLND * const conn TSRMLS_DC) /* }}} */ -/* {{{ mysqlnd_conn::stat */ +/* {{{ mysqlnd_conn::statistic */ 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; MYSQLND_PACKET_STATS * stats_header; - DBG_ENTER("mysqlnd_conn::stat"); + DBG_ENTER("mysqlnd_conn::statistic"); DBG_INF_FMT("conn=%llu", conn->thread_id); ret = conn->m->simple_command(conn, COM_STATISTICS, NULL, 0, PROT_LAST, FALSE, TRUE TSRMLS_CC); @@ -1560,13 +1560,13 @@ MYSQLND_METHOD(mysqlnd_conn, close)(MYSQLND * conn, enum_connection_close_type c STAT_CLOSE_IMPLICIT, 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_INF_FMT("conn=%llu", conn->thread_id); 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); if (conn->persistent) { MYSQLND_DEC_CONN_STATISTIC(conn->stats, STAT_OPENED_PERSISTENT_CONNECTIONS); @@ -2256,7 +2256,7 @@ MYSQLND_CLASS_METHODS_START(mysqlnd_conn) MYSQLND_METHOD(mysqlnd_conn, get_server_version), 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_proto_info), MYSQLND_METHOD(mysqlnd_conn, info), |