Rolloup of all of the current build.

[awesomized/libmemcached] / libmemcached / delete.cc

diff --git a/libmemcached/delete.cc b/libmemcached/delete.cc
index 7348dabe2d92ef5105fb3cfa48785368c4cdf67f..669d8ae130e5c5f7b118fae59e66ef311734da49 100644 (file)
--- a/libmemcached/delete.cc
+++ b/libmemcached/delete.cc
@@ -70,11 +70,10 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr,
   rc= memcached_validate_key_length(key_length,
                                     ptr->flags.binary_protocol);
 
-  unlikely (memcached_failed(rc))
+  if (memcached_failed(rc))
+  {
     return rc;
-
-  unlikely (memcached_server_count(ptr) == 0)
-    return MEMCACHED_NO_SERVERS;
+  }
 
   uint32_t server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length);
   instance= memcached_server_instance_fetch(ptr, server_key);
@@ -242,7 +241,6 @@ static inline memcached_return_t binary_delete(memcached_st *ptr,
   if ((rc= memcached_vdo(instance, vector,  3, flush)) != MEMCACHED_SUCCESS)
   {
     memcached_io_reset(instance);
-    rc= (rc == MEMCACHED_SUCCESS) ? MEMCACHED_WRITE_FAILURE : rc;
   }
 
   unlikely (ptr->number_of_replicas > 0)