diff options
Diffstat (limited to 'ext/mysqlnd/mysqlnd_statistics.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_statistics.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c index d2fed161f9..f550948035 100644 --- a/ext/mysqlnd/mysqlnd_statistics.c +++ b/ext/mysqlnd/mysqlnd_statistics.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 2006-2015 The PHP Group | +----------------------------------------------------------------------+ @@ -26,32 +26,32 @@ #include "mysqlnd_debug.h" -/* {{{ mysqlnd_stats_values_names +/* {{{ mysqlnd_stats_values_names */ const MYSQLND_STRING mysqlnd_stats_values_names[STAT_LAST] = { { MYSQLND_STR_W_LEN("bytes_sent") }, - { MYSQLND_STR_W_LEN("bytes_received") }, + { MYSQLND_STR_W_LEN("bytes_received") }, { MYSQLND_STR_W_LEN("packets_sent") }, { MYSQLND_STR_W_LEN("packets_received") }, { MYSQLND_STR_W_LEN("protocol_overhead_in") }, { MYSQLND_STR_W_LEN("protocol_overhead_out") }, - { MYSQLND_STR_W_LEN("bytes_received_ok_packet") }, - { MYSQLND_STR_W_LEN("bytes_received_eof_packet") }, - { MYSQLND_STR_W_LEN("bytes_received_rset_header_packet") }, - { MYSQLND_STR_W_LEN("bytes_received_rset_field_meta_packet") }, - { MYSQLND_STR_W_LEN("bytes_received_rset_row_packet") }, - { MYSQLND_STR_W_LEN("bytes_received_prepare_response_packet") }, - { MYSQLND_STR_W_LEN("bytes_received_change_user_packet") }, - { MYSQLND_STR_W_LEN("packets_sent_command") }, - { MYSQLND_STR_W_LEN("packets_received_ok") }, - { MYSQLND_STR_W_LEN("packets_received_eof") }, - { MYSQLND_STR_W_LEN("packets_received_rset_header") }, - { MYSQLND_STR_W_LEN("packets_received_rset_field_meta") }, - { MYSQLND_STR_W_LEN("packets_received_rset_row") }, - { MYSQLND_STR_W_LEN("packets_received_prepare_response") }, - { MYSQLND_STR_W_LEN("packets_received_change_user") }, + { MYSQLND_STR_W_LEN("bytes_received_ok_packet") }, + { MYSQLND_STR_W_LEN("bytes_received_eof_packet") }, + { MYSQLND_STR_W_LEN("bytes_received_rset_header_packet") }, + { MYSQLND_STR_W_LEN("bytes_received_rset_field_meta_packet") }, + { MYSQLND_STR_W_LEN("bytes_received_rset_row_packet") }, + { MYSQLND_STR_W_LEN("bytes_received_prepare_response_packet") }, + { MYSQLND_STR_W_LEN("bytes_received_change_user_packet") }, + { MYSQLND_STR_W_LEN("packets_sent_command") }, + { MYSQLND_STR_W_LEN("packets_received_ok") }, + { MYSQLND_STR_W_LEN("packets_received_eof") }, + { MYSQLND_STR_W_LEN("packets_received_rset_header") }, + { MYSQLND_STR_W_LEN("packets_received_rset_field_meta") }, + { MYSQLND_STR_W_LEN("packets_received_rset_row") }, + { MYSQLND_STR_W_LEN("packets_received_prepare_response") }, + { MYSQLND_STR_W_LEN("packets_received_change_user") }, { MYSQLND_STR_W_LEN("result_set_queries") }, { MYSQLND_STR_W_LEN("non_result_set_queries") }, { MYSQLND_STR_W_LEN("no_index_used") }, @@ -197,16 +197,16 @@ const MYSQLND_STRING mysqlnd_stats_values_names[STAT_LAST] = /* {{{ mysqlnd_fill_stats_hash */ PHPAPI void -mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING * names, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC) +mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING * names, zval *return_value ZEND_FILE_LINE_DC) { unsigned int i; - mysqlnd_array_init(return_value, stats->count); + array_init_size(return_value, stats->count); for (i = 0; i < stats->count; i++) { char tmp[25]; sprintf((char *)&tmp, MYSQLND_LLU_SPEC, stats->values[i]); - add_assoc_string_ex(return_value, names[i].s, names[i].l + 1, tmp, 1); + add_assoc_string_ex(return_value, names[i].s, names[i].l, tmp); } } /* }}} */ @@ -214,7 +214,7 @@ mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING /* {{{ _mysqlnd_get_client_stats */ PHPAPI void -_mysqlnd_get_client_stats(zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC) +_mysqlnd_get_client_stats(zval *return_value ZEND_FILE_LINE_DC) { MYSQLND_STATS stats, *stats_ptr = mysqlnd_global_stats; DBG_ENTER("_mysqlnd_get_client_stats"); @@ -222,7 +222,7 @@ _mysqlnd_get_client_stats(zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC) memset(&stats, 0, sizeof(stats)); stats_ptr = &stats; } - mysqlnd_fill_stats_hash(stats_ptr, mysqlnd_stats_values_names, return_value TSRMLS_CC ZEND_FILE_LINE_CC); + mysqlnd_fill_stats_hash(stats_ptr, mysqlnd_stats_values_names, return_value ZEND_FILE_LINE_CC); DBG_VOID_RETURN; } /* }}} */ @@ -264,7 +264,7 @@ mysqlnd_stats_end(MYSQLND_STATS * stats) /* {{{ mysqlnd_stats_set_trigger */ PHPAPI mysqlnd_stat_trigger -mysqlnd_stats_set_trigger(MYSQLND_STATS * const stats, enum_mysqlnd_collected_stats statistic, mysqlnd_stat_trigger trigger TSRMLS_DC) +mysqlnd_stats_set_trigger(MYSQLND_STATS * const stats, enum_mysqlnd_collected_stats statistic, mysqlnd_stat_trigger trigger) { mysqlnd_stat_trigger ret = NULL; DBG_ENTER("mysqlnd_stats_set_trigger"); @@ -281,7 +281,7 @@ mysqlnd_stats_set_trigger(MYSQLND_STATS * const stats, enum_mysqlnd_collected_st /* {{{ mysqlnd_stats_set_handler */ PHPAPI mysqlnd_stat_trigger -mysqlnd_stats_reset_triggers(MYSQLND_STATS * const stats TSRMLS_DC) +mysqlnd_stats_reset_triggers(MYSQLND_STATS * const stats) { mysqlnd_stat_trigger ret = NULL; DBG_ENTER("mysqlnd_stats_reset_trigger"); |