From 3337fe07860804ea2654aa53e9ecdf9470434016 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Sat, 18 Feb 2012 07:58:07 -0800 Subject: [PATCH] Update to use memcached_fatal() for purge return test. --- libmemcached/io.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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; } -- 2.30.2