diff options
| author | Xinchen Hui <laruence@php.net> | 2014-08-13 15:51:43 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-08-13 15:51:43 +0800 |
| commit | da3aeeed39f24e34e9318d7123ff84f0c5a98e61 (patch) | |
| tree | 422cc176cbd624f5c4dcd78e66e3403b095ec7b8 /ext/mysqlnd/mysqlnd.c | |
| parent | 05eaed43453bf74144bc6115db641e9e8a41d568 (diff) | |
| download | php-git-da3aeeed39f24e34e9318d7123ff84f0c5a98e61.tar.gz | |
clean up - avoid realloc
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index e3f52c1d0d..e05d6844bc 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -1727,7 +1727,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, ping)(MYSQLND_CONN_DATA * const conn TSRMLS_DC /* {{{ mysqlnd_conn_data::statistic */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn_data, statistic)(MYSQLND_CONN_DATA * conn, char **message, unsigned int * message_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn_data, statistic)(MYSQLND_CONN_DATA * conn, zend_string **message TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, get_server_statistics); enum_func_status ret = FAIL; @@ -1750,9 +1750,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, statistic)(MYSQLND_CONN_DATA * conn, char **me if (PASS == (ret = PACKET_READ(stats_header, conn))) { /* will be freed by Zend, thus don't use the mnd_ allocator */ - *message = estrndup(stats_header->message, stats_header->message_len); - *message_len = stats_header->message_len; - DBG_INF(*message); + *message = STR_INIT(stats_header->message, stats_header->message_len, 0); + DBG_INF((*message)->val); } PACKET_FREE(stats_header); } while (0); |