X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fresponse.c;h=c14dd1ff6688c6678922c5d4356c77e02bbe6e17;hb=9a00fe7032d5b9521004198479a4656f77bd4e3c;hp=3784438ede3a54dc5c8cfedfb22809c7aa82252a;hpb=a6d18834a85d2a65caae820ee426169af5aff800;p=m6w6%2Flibmemcached diff --git a/libmemcached/response.c b/libmemcached/response.c index 3784438e..c14dd1ff 100644 --- a/libmemcached/response.c +++ b/libmemcached/response.c @@ -11,14 +11,14 @@ #include "common.h" -static memcached_return_t textual_read_one_response(memcached_server_instance_st *ptr, +static memcached_return_t textual_read_one_response(memcached_server_write_instance_st ptr, char *buffer, size_t buffer_length, memcached_result_st *result); -static memcached_return_t binary_read_one_response(memcached_server_instance_st *ptr, +static memcached_return_t binary_read_one_response(memcached_server_write_instance_st ptr, char *buffer, size_t buffer_length, memcached_result_st *result); -memcached_return_t memcached_read_one_response(memcached_server_instance_st *ptr, +memcached_return_t memcached_read_one_response(memcached_server_write_instance_st ptr, char *buffer, size_t buffer_length, memcached_result_st *result) { @@ -45,14 +45,14 @@ memcached_return_t memcached_read_one_response(memcached_server_instance_st *ptr return rc; } -memcached_return_t memcached_response(memcached_server_instance_st *ptr, +memcached_return_t memcached_response(memcached_server_write_instance_st ptr, char *buffer, size_t buffer_length, memcached_result_st *result) { /* We may have old commands in the buffer not set, first purge */ if ((ptr->root->flags.no_block) && (memcached_is_processing_input(ptr->root) == false)) { - (void)memcached_io_write(ptr, NULL, 0, 1); + (void)memcached_io_write(ptr, NULL, 0, true); } /* @@ -79,7 +79,7 @@ memcached_return_t memcached_response(memcached_server_instance_st *ptr, return memcached_read_one_response(ptr, buffer, buffer_length, result); } -static memcached_return_t textual_value_fetch(memcached_server_instance_st *ptr, +static memcached_return_t textual_value_fetch(memcached_server_write_instance_st ptr, char *buffer, memcached_result_st *result) { @@ -210,7 +210,7 @@ read_error: return MEMCACHED_PARTIAL_READ; } -static memcached_return_t textual_read_one_response(memcached_server_instance_st *ptr, +static memcached_return_t textual_read_one_response(memcached_server_write_instance_st ptr, char *buffer, size_t buffer_length, memcached_result_st *result) { @@ -327,7 +327,7 @@ static memcached_return_t textual_read_one_response(memcached_server_instance_st /* NOTREACHED */ } -static memcached_return_t binary_read_one_response(memcached_server_instance_st *ptr, +static memcached_return_t binary_read_one_response(memcached_server_write_instance_st ptr, char *buffer, size_t buffer_length, memcached_result_st *result) {