mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
cosmetics
This commit is contained in:
parent
91ce3764f0
commit
d62bc53a4f
@ -527,7 +527,7 @@ MYSQLND_METHOD(mysqlnd_net, read_compressed_packet_from_stream_and_fill_read_buf
|
||||
enum_func_status retval = PASS;
|
||||
zend_uchar * compressed_data = NULL;
|
||||
zend_uchar comp_header[COMPRESSED_HEADER_SIZE];
|
||||
DBG_ENTER("mysqlnd_net::read_compressed_packet_from_stream_and_fill_read_buffe");
|
||||
DBG_ENTER("mysqlnd_net::read_compressed_packet_from_stream_and_fill_read_buffer");
|
||||
|
||||
/* Read the compressed header */
|
||||
if (FAIL == net->data->m.network_read_ex(net, comp_header, COMPRESSED_HEADER_SIZE, conn_stats, error_info TSRMLS_CC)) {
|
||||
@ -631,13 +631,13 @@ MYSQLND_METHOD(mysqlnd_net, receive_ex)(MYSQLND_NET * const net, zend_uchar * co
|
||||
if (net->data->compressed) {
|
||||
if (net->uncompressed_data) {
|
||||
size_t to_read_from_buffer = MIN(net->uncompressed_data->bytes_left(net->uncompressed_data), to_read);
|
||||
DBG_INF_FMT("reading %u from uncompressed_data buffer", to_read_from_buffer);
|
||||
DBG_INF_FMT("reading "MYSQLND_SZ_T_SPEC" from uncompressed_data buffer", to_read_from_buffer);
|
||||
if (to_read_from_buffer) {
|
||||
net->uncompressed_data->read(net->uncompressed_data, to_read_from_buffer, (zend_uchar *) p);
|
||||
p += to_read_from_buffer;
|
||||
to_read -= to_read_from_buffer;
|
||||
}
|
||||
DBG_INF_FMT("left %u to read", to_read);
|
||||
DBG_INF_FMT("left "MYSQLND_SZ_T_SPEC" to read", to_read);
|
||||
if (TRUE == net->uncompressed_data->is_empty(net->uncompressed_data)) {
|
||||
/* Everything was consumed. This should never happen here, but for security */
|
||||
net->uncompressed_data->free_buffer(&net->uncompressed_data TSRMLS_CC);
|
||||
@ -697,7 +697,7 @@ MYSQLND_METHOD(mysqlnd_net, set_client_option)(MYSQLND_NET * const net, enum mys
|
||||
DBG_RETURN(FAIL);
|
||||
}
|
||||
net->cmd_buffer.length = *(unsigned int*) value;
|
||||
DBG_INF_FMT("new_length=%u", net->cmd_buffer.length);
|
||||
DBG_INF_FMT("new_length="MYSQLND_SZ_T_SPEC, net->cmd_buffer.length);
|
||||
if (!net->cmd_buffer.buffer) {
|
||||
net->cmd_buffer.buffer = mnd_pemalloc(net->cmd_buffer.length, net->persistent);
|
||||
} else {
|
||||
@ -707,7 +707,7 @@ MYSQLND_METHOD(mysqlnd_net, set_client_option)(MYSQLND_NET * const net, enum mys
|
||||
case MYSQLND_OPT_NET_READ_BUFFER_SIZE:
|
||||
DBG_INF("MYSQLND_OPT_NET_READ_BUFFER_SIZE");
|
||||
net->data->options.net_read_buffer_size = *(unsigned int*) value;
|
||||
DBG_INF_FMT("new_length=%u", net->data->options.net_read_buffer_size);
|
||||
DBG_INF_FMT("new_length="MYSQLND_SZ_T_SPEC, net->data->options.net_read_buffer_size);
|
||||
break;
|
||||
case MYSQL_OPT_CONNECT_TIMEOUT:
|
||||
DBG_INF("MYSQL_OPT_CONNECT_TIMEOUT");
|
||||
|
Loading…
Reference in New Issue
Block a user