X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fio.cc;h=ab9c9b9265b3c5fdba2ca05f36ed38fb3d75bfec;hb=3337fe07860804ea2654aa53e9ecdf9470434016;hp=e0c6284bfe94014f3854ee5922d660b493b4fcdd;hpb=a37165d68bcbe1b2d0013a912dea413d4239d0fe;p=m6w6%2Flibmemcached diff --git a/libmemcached/io.cc b/libmemcached/io.cc index e0c6284b..ab9c9b92 100644 --- a/libmemcached/io.cc +++ b/libmemcached/io.cc @@ -193,7 +193,7 @@ static memcached_return_t io_wait(memcached_server_write_instance_st ptr, if (read_or_write == MEM_WRITE) { memcached_return_t rc= memcached_purge(ptr); - if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_STORED) + if (memcached_fatal(rc)) { return MEMCACHED_FAILURE; } @@ -278,11 +278,10 @@ static bool io_flush(memcached_server_write_instance_st ptr, ** in the purge function to avoid duplicating the logic.. */ { - memcached_return_t rc; 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; }