X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstorage.cc;h=61ca8270cce22d77ac8db9f7c4c32c81709b9329;hb=1be11f8bb8fdf368985d9e1c900b250541dc4791;hp=80b5a7f1129b24845bd9e81b487a71efad73cc23;hpb=28d3641c8331dfe348a119c6eb4bd776c526da48;p=awesomized%2Flibmemcached

diff --git a/libmemcached/storage.cc b/libmemcached/storage.cc
index 80b5a7f1..61ca8270 100644
--- a/libmemcached/storage.cc
+++ b/libmemcached/storage.cc
@@ -74,7 +74,7 @@ static inline const char *storage_op_string(memcached_storage_action_t verb)
   return "set ";
 }
 
-static inline uint8_t can_by_encrypted(const memcached_storage_action_t verb)
+static inline bool can_by_encrypted(const memcached_storage_action_t verb)
 {
   switch (verb)
   {
@@ -192,15 +192,6 @@ static memcached_return_t memcached_send_binary(Memcached *ptr,
   memcached_return_t rc;
   if ((rc= memcached_vdo(server, vector, 5, flush)) != MEMCACHED_SUCCESS)
   {
-    memcached_io_reset(server);
-
-#if 0
-    if (memcached_has_error(ptr))
-    {
-      memcached_set_error(*server, rc, MEMCACHED_AT);
-    }
-#endif
-
     assert(memcached_last_error(server->root) != MEMCACHED_SUCCESS);
     return memcached_last_error(server->root);
   }
@@ -220,11 +211,7 @@ static memcached_return_t memcached_send_binary(Memcached *ptr,
 
       memcached_instance_st* instance= memcached_instance_fetch(ptr, server_key);
 
-      if (memcached_vdo(instance, vector, 5, false) != MEMCACHED_SUCCESS)
-      {
-        memcached_io_reset(instance);
-      }
-      else
+      if (memcached_success(memcached_vdo(instance, vector, 5, false)))
       {
         memcached_server_response_decrement(instance);
       }
@@ -335,11 +322,6 @@ static memcached_return_t memcached_send_ascii(Memcached *ptr,
     }
   }
 
-  if (rc == MEMCACHED_WRITE_FAILURE)
-  {
-    memcached_io_reset(instance);
-  }
-
   assert(memcached_failed(rc));
 #if 0
   if (memcached_has_error(ptr) == false)
@@ -378,7 +360,6 @@ static inline memcached_return_t memcached_send(memcached_st *shell,
   WATCHPOINT_SET(instance->io_wait_count.read= 0);
   WATCHPOINT_SET(instance->io_wait_count.write= 0);
 
-
   bool flush= true;
   if (memcached_is_buffering(instance->root) and verb == SET_OP)
   {