projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixed unittests and vc-changelog.
[awesomized/libmemcached]
/
libmemcached
/
flush.c
diff --git
a/libmemcached/flush.c
b/libmemcached/flush.c
index cb044b0c6e1216015311d137915cc852fa2a71dc..425d4576b8abeae82685d9b4f9b2b4ac90e970ca 100644
(file)
--- a/
libmemcached/flush.c
+++ b/
libmemcached/flush.c
@@
-32,7
+32,7
@@
static memcached_return_t memcached_flush_textual(memcached_st *ptr,
for (x= 0; x < memcached_server_count(ptr); x++)
{
bool no_reply= ptr->flags.no_reply;
for (x= 0; x < memcached_server_count(ptr); x++)
{
bool no_reply= ptr->flags.no_reply;
- memcached_server_
instance_st *
instance=
+ memcached_server_
write_instance_st
instance=
memcached_server_instance_fetch(ptr, x);
if (expiration)
memcached_server_instance_fetch(ptr, x);
if (expiration)
@@
-43,7
+43,7
@@
static memcached_return_t memcached_flush_textual(memcached_st *ptr,
send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"flush_all%s\r\n", no_reply ? " noreply" : "");
send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"flush_all%s\r\n", no_reply ? " noreply" : "");
- rc= memcached_do(instance, buffer, send_length,
1
);
+ rc= memcached_do(instance, buffer, send_length,
true
);
if (rc == MEMCACHED_SUCCESS && !no_reply)
(void)memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
if (rc == MEMCACHED_SUCCESS && !no_reply)
(void)memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
@@
-55,7
+55,6
@@
static memcached_return_t memcached_flush_textual(memcached_st *ptr,
static memcached_return_t memcached_flush_binary(memcached_st *ptr,
time_t expiration)
{
static memcached_return_t memcached_flush_binary(memcached_st *ptr,
time_t expiration)
{
- uint32_t x;
protocol_binary_request_flush request= {.bytes= {0}};
unlikely (memcached_server_count(ptr) == 0)
protocol_binary_request_flush request= {.bytes= {0}};
unlikely (memcached_server_count(ptr) == 0)
@@
-68,9
+67,9
@@
static memcached_return_t memcached_flush_binary(memcached_st *ptr,
request.message.header.request.bodylen= htonl(request.message.header.request.extlen);
request.message.body.expiration= htonl((uint32_t) expiration);
request.message.header.request.bodylen= htonl(request.message.header.request.extlen);
request.message.body.expiration= htonl((uint32_t) expiration);
- for (x= 0; x < memcached_server_count(ptr); x++)
+ for (
uint32_t
x= 0; x < memcached_server_count(ptr); x++)
{
{
- memcached_server_
instance_st *
instance=
+ memcached_server_
write_instance_st
instance=
memcached_server_instance_fetch(ptr, x);
if (ptr->flags.no_reply)
memcached_server_instance_fetch(ptr, x);
if (ptr->flags.no_reply)
@@
-82,17
+81,16
@@
static memcached_return_t memcached_flush_binary(memcached_st *ptr,
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_FLUSH;
}
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_FLUSH;
}
- if (memcached_do(instance, request.bytes,
- sizeof(request.bytes), 1) != MEMCACHED_SUCCESS)
+ if (memcached_do(instance, request.bytes, sizeof(request.bytes), true) != MEMCACHED_SUCCESS)
{
memcached_io_reset(instance);
return MEMCACHED_WRITE_FAILURE;
}
}
{
memcached_io_reset(instance);
return MEMCACHED_WRITE_FAILURE;
}
}
- for (x= 0; x < memcached_server_count(ptr); x++)
+ for (
uint32_t
x= 0; x < memcached_server_count(ptr); x++)
{
{
- memcached_server_
instance_st *
instance=
+ memcached_server_
write_instance_st
instance=
memcached_server_instance_fetch(ptr, x);
if (memcached_server_response_count(instance) > 0)
memcached_server_instance_fetch(ptr, x);
if (memcached_server_response_count(instance) > 0)