From: Brian Aker <brian@tangent.org>
Date: Sat, 18 Feb 2012 15:58:43 +0000 (-0800)
Subject: Update from build trunk
X-Git-Tag: 1.0.7~17^2~5
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=e01fd594da5192aca15a99b1e7df25eacb28514f;hp=6ef1a889424da12b942330a82ffebe268494cd70;p=m6w6%2Flibmemcached

Update from build trunk
---

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;
     }