projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge up.
[awesomized/libmemcached]
/
libmemcached
/
io.cc
diff --git
a/libmemcached/io.cc
b/libmemcached/io.cc
index e0c6284bfe94014f3854ee5922d660b493b4fcdd..049c436dbcb7f24e12a2511c32b00e88b192bade 100644
(file)
--- a/
libmemcached/io.cc
+++ b/
libmemcached/io.cc
@@
-192,8
+192,7
@@
static memcached_return_t io_wait(memcached_server_write_instance_st ptr,
*/
if (read_or_write == MEM_WRITE)
{
*/
if (read_or_write == MEM_WRITE)
{
- memcached_return_t rc= memcached_purge(ptr);
- if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_STORED)
+ if (memcached_fatal(memcached_purge(ptr)))
{
return MEMCACHED_FAILURE;
}
{
return MEMCACHED_FAILURE;
}
@@
-278,11
+277,10
@@
static bool io_flush(memcached_server_write_instance_st ptr,
** in the purge function to avoid duplicating the logic..
*/
{
** in the purge function to avoid duplicating the logic..
*/
{
- memcached_return_t rc;
WATCHPOINT_ASSERT(ptr->fd != INVALID_SOCKET);
WATCHPOINT_ASSERT(ptr->fd != INVALID_SOCKET);
- rc= memcached_purge(ptr);
+
memcached_return_t
rc= memcached_purge(ptr);
- if (rc != MEMCACHED_SUCCESS
&&
rc != MEMCACHED_STORED)
+ if (rc != MEMCACHED_SUCCESS
and
rc != MEMCACHED_STORED)
{
return false;
}
{
return false;
}