projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update tests for style/correctness.
[awesomized/libmemcached]
/
libmemcached
/
flush.cc
diff --git
a/libmemcached/flush.cc
b/libmemcached/flush.cc
index 9eb17c655a5a4b462943e8da920c7bd6c8647640..99da07f4f471ce4057f726e0017c7179180ec44d 100644
(file)
--- a/
libmemcached/flush.cc
+++ b/
libmemcached/flush.cc
@@
-67,7
+67,7
@@
static memcached_return_t memcached_flush_textual(memcached_st *ptr,
time_t expiration)
{
// Invert the logic to make it simpler to read the code
time_t expiration)
{
// Invert the logic to make it simpler to read the code
- bool reply=
(ptr->flags.no_reply) ? false : true
;
+ bool reply=
memcached_is_replying(ptr)
;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
int send_length= 0;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
int send_length= 0;
@@
-134,17
+134,22
@@
static memcached_return_t memcached_flush_binary(memcached_st *ptr,
{
memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, x);
{
memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, x);
- if (
ptr->flags.no_reply
)
+ if (
memcached_is_replying(ptr)
)
{
{
- request.message.header.request.opcode= PROTOCOL_BINARY_CMD_FLUSH
Q
;
+ request.message.header.request.opcode= PROTOCOL_BINARY_CMD_FLUSH;
}
else
{
}
else
{
- request.message.header.request.opcode= PROTOCOL_BINARY_CMD_FLUSH;
+ request.message.header.request.opcode= PROTOCOL_BINARY_CMD_FLUSH
Q
;
}
}
+ struct libmemcached_io_vector_st vector[]=
+ {
+ { request.bytes, sizeof(request.bytes) }
+ };
+
memcached_return_t rrc;
memcached_return_t rrc;
- if ((rrc= memcached_
do(instance, request.bytes, sizeof(request.bytes)
, true)))
+ if ((rrc= memcached_
vdo(instance, vector, 1
, true)))
{
memcached_set_error(*instance, rrc, MEMCACHED_AT);
memcached_io_reset(instance);
{
memcached_set_error(*instance, rrc, MEMCACHED_AT);
memcached_io_reset(instance);