cppcheck: fix warnings

[awesomized/libmemcached] / libmemcached / delete.cc

diff --git a/libmemcached/delete.cc b/libmemcached/delete.cc
index 55a8b4ca17e9932040c9edac9ad97ab52d15f677..ef1d8472528531e4157d8c21fc4d37adc20504f0 100644 (file)
--- a/libmemcached/delete.cc
+++ b/libmemcached/delete.cc
@@ -36,7 +36,6 @@
  */
 
 #include <libmemcached/common.h>
-#include <libmemcached/memcached/protocol_binary.h>
 
 memcached_return_t memcached_delete(memcached_st *shell, const char *key, size_t key_length,
                                     time_t expiration)
@@ -98,12 +97,7 @@ static inline memcached_return_t binary_delete(memcached_instance_st* instance,
     { key, key_length }
   };
 
-  memcached_return_t rc;
-  if (memcached_fatal(rc= memcached_vdo(instance, vector,  4, should_flush)))
-  {
-    assert(memcached_last_error(instance->root) != MEMCACHED_SUCCESS);
-    memcached_io_reset(instance);
-  }
+  memcached_return_t rc= memcached_vdo(instance, vector,  4, should_flush);
 
   if (memcached_has_replicas(instance))
   {
@@ -120,12 +114,7 @@ static inline memcached_return_t binary_delete(memcached_instance_st* instance,
 
       memcached_instance_st* replica= memcached_instance_fetch(instance->root, server_key);
 
-      if (memcached_fatal(memcached_vdo(replica, vector, 4, should_flush)))
-      {
-        assert(memcached_last_error(instance->root) != MEMCACHED_SUCCESS);
-        memcached_io_reset(replica);
-      }
-      else
+      if (memcached_success(memcached_vdo(replica, vector, 4, should_flush)))
       {
         memcached_server_response_decrement(replica);
       }