X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fpurge.cc;h=38e4552a0dd97b698cbe88bb12cc9719f0a1dcb6;hb=a28d1ecc082d9d08c4f59f071de9a43fbd08aee3;hp=4dd654199ed0cb858460140023c7af7dd1996392;hpb=9169cee9ec0f231b3117a0d5a7840d2067f29610;p=m6w6%2Flibmemcached

diff --git a/libmemcached/purge.cc b/libmemcached/purge.cc
index 4dd65419..38e4552a 100644
--- a/libmemcached/purge.cc
+++ b/libmemcached/purge.cc
@@ -40,9 +40,8 @@
 #include <libmemcached/common.h>
 
 
-memcached_return_t memcached_purge(memcached_server_write_instance_st ptr)
+bool memcached_purge(memcached_server_write_instance_st ptr)
 {
-  memcached_return_t ret= MEMCACHED_SUCCESS;
   memcached_st *root= (memcached_st *)ptr->root;
 
   if (memcached_is_purging(ptr->root) || /* already purging */
@@ -51,7 +50,7 @@ memcached_return_t memcached_purge(memcached_server_write_instance_st ptr)
       (ptr->io_bytes_sent >= ptr->root->io_bytes_watermark &&
        memcached_server_response_count(ptr) < 2))
   {
-    return MEMCACHED_SUCCESS;
+    return true;
   }
 
   /*
@@ -69,10 +68,12 @@ memcached_return_t memcached_purge(memcached_server_write_instance_st ptr)
   {
     memcached_set_purging(root, true);
 
-    return memcached_set_error(*ptr, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
+    memcached_set_error(*ptr, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
+    return false;
   }
   WATCHPOINT_ASSERT(ptr->fd != INVALID_SOCKET);
 
+  bool is_successful= true;
   uint32_t no_msg= memcached_server_response_count(ptr) - 1;
   if (no_msg > 0)
   {
@@ -103,10 +104,7 @@ memcached_return_t memcached_purge(memcached_server_write_instance_st ptr)
       {
         WATCHPOINT_ERROR(rc);
         memcached_io_reset(ptr);
-        ret= rc;
-#if 0
-        ret= memcached_set_error(*ptr, rc, MEMCACHED_AT);
-#endif
+        is_successful= false;
       }
 
       if (ptr->root->callbacks != NULL)
@@ -116,8 +114,7 @@ memcached_return_t memcached_purge(memcached_server_write_instance_st ptr)
         {
           for (uint32_t y= 0; y < cb.number_of_callback; y++)
           {
-            rc = (*cb.callback[y])(ptr->root, result_ptr, cb.context);
-            if (rc != MEMCACHED_SUCCESS)
+            if (memcached_fatal((*cb.callback[y])(ptr->root, result_ptr, cb.context)))
             {
               break;
             }
@@ -131,5 +128,5 @@ memcached_return_t memcached_purge(memcached_server_write_instance_st ptr)
   }
   memcached_set_purging(root, false);
 
-  return ret;
+  return is_successful;
 }