projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-54
[awesomized/libmemcached]
/
libmemcached
/
flush_buffers.cc
diff --git
a/libmemcached/flush_buffers.cc
b/libmemcached/flush_buffers.cc
index bb3c4dec33d171f6ce46026883e41c467a26991a..af6942b4a79c6e9b9f1b2fee6658835186303c80 100644
(file)
--- a/
libmemcached/flush_buffers.cc
+++ b/
libmemcached/flush_buffers.cc
@@
-43,19
+43,18
@@
memcached_return_t memcached_flush_buffers(memcached_st *memc)
for (uint32_t x= 0; x < memcached_server_count(memc); ++x)
{
for (uint32_t x= 0; x < memcached_server_count(memc); ++x)
{
- memcached_server_write_instance_st instance=
- memcached_server_instance_fetch(memc, x);
+ org::libmemcached::Instance* instance= memcached_instance_fetch(memc, x);
if (instance->write_buffer_offset != 0)
{
if (instance->write_buffer_offset != 0)
{
- if (instance->fd ==
-1 &&
+ if (instance->fd ==
INVALID_SOCKET and
(ret= memcached_connect(instance)) != MEMCACHED_SUCCESS)
{
WATCHPOINT_ERROR(ret);
return ret;
}
(ret= memcached_connect(instance)) != MEMCACHED_SUCCESS)
{
WATCHPOINT_ERROR(ret);
return ret;
}
- if (memcached_io_write(instance
, NULL, 0, true) == -1
)
+ if (memcached_io_write(instance
) == false
)
{
ret= MEMCACHED_SOME_ERRORS;
}
{
ret= MEMCACHED_SOME_ERRORS;
}