projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix NULL bit to exist for UDP
[awesomized/libmemcached]
/
libmemcached
/
flush.cc
diff --git
a/libmemcached/flush.cc
b/libmemcached/flush.cc
index 45cb458648de5233081745a1cfa0c16c90c825d9..44a1429afe8c0cbd7ace71f2cccea2f8e8863c01 100644
(file)
--- a/
libmemcached/flush.cc
+++ b/
libmemcached/flush.cc
@@
-44,7
+44,7
@@
static memcached_return_t memcached_flush_textual(memcached_st *ptr,
memcached_return_t memcached_flush(memcached_st *ptr, time_t expiration)
{
memcached_return_t rc;
memcached_return_t memcached_flush(memcached_st *ptr, time_t expiration)
{
memcached_return_t rc;
- if (memcached_failed(rc= initialize_query(ptr)))
+ if (memcached_failed(rc= initialize_query(ptr
, true
)))
{
return rc;
}
{
return rc;
}
@@
-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;
@@
-82,7
+82,7
@@
static memcached_return_t memcached_flush_textual(memcached_st *ptr,
memcached_literal_param("snprintf(MEMCACHED_DEFAULT_COMMAND_SIZE)"));
}
memcached_literal_param("snprintf(MEMCACHED_DEFAULT_COMMAND_SIZE)"));
}
-
struct
libmemcached_io_vector_st vector[]=
+ libmemcached_io_vector_st vector[]=
{
{ memcached_literal_param("flush_all ") },
{ buffer, send_length },
{
{ memcached_literal_param("flush_all ") },
{ buffer, send_length },
@@
-134,16
+134,16
@@
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[]=
+ libmemcached_io_vector_st vector[]=
{
{ request.bytes, sizeof(request.bytes) }
};
{
{ request.bytes, sizeof(request.bytes) }
};