Fixing failure of socket issue.

[m6w6/libmemcached] / lib / memcached_delete.c

diff --git a/lib/memcached_delete.c b/lib/memcached_delete.c
index cedfa442c86d2680b557f5b74a4d8a3393309864..0c36aaebb172b40fcb6c8ed643b109db02aed602 100644 (file)
--- a/lib/memcached_delete.c
+++ b/lib/memcached_delete.c
@@ -4,7 +4,7 @@ memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
                                   time_t expiration)
 {
   char to_write;
-  size_t send_length, sent_length;
+  size_t send_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
@@ -19,10 +19,6 @@ memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
 
   server_key= memcached_generate_hash(ptr, key, key_length);
 
-  if ((rc= memcached_connect(ptr, server_key)) != MEMCACHED_SUCCESS)
-    return rc;
-
-
   if (expiration)
     send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                           "delete %.*s %llu\r\n", (int)key_length, key, 
@@ -42,12 +38,9 @@ memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
   else
     to_write= 1;
 
-  if ((sent_length= memcached_io_write(ptr, server_key, buffer, send_length, to_write)) == -1)
-  {
-    memcached_quit_server(ptr, server_key);
-    rc= MEMCACHED_WRITE_FAILURE;
+  rc= memcached_do(ptr, server_key, buffer, send_length, to_write);
+  if (rc != MEMCACHED_SUCCESS)
     goto error;
-  }
 
   if ((ptr->flags & MEM_NO_BLOCK))
   {
@@ -61,8 +54,7 @@ memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
       rc= MEMCACHED_SUCCESS;
   }
 
-  LIBMEMCACHED_MEMCACHED_DELETE_END();
-
 error:
+  LIBMEMCACHED_MEMCACHED_DELETE_END();
   return rc;
 }