X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_delete.c;h=519e52bec6fea58f6d304bf187d289f61559acec;hb=acca3c7ad60716bf073ae8de0652517542cdd224;hp=0ed6092a03f0b8114e003ea31d22149d467e9bcc;hpb=131622cdc2710ecd9ad554ce7d08c6003fbdcf6e;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_delete.c b/lib/memcached_delete.c
index 0ed6092a..519e52be 100644
--- a/lib/memcached_delete.c
+++ b/lib/memcached_delete.c
@@ -2,23 +2,31 @@
 
 memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
                                   time_t expiration)
+{
+  return memcached_delete_by_key(ptr, key, key_length,
+                                 key, key_length, expiration);
+}
+
+memcached_return memcached_delete_by_key(memcached_st *ptr, 
+                                         char *master_key, size_t master_key_length,
+                                         char *key, size_t key_length,
+                                         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;
 
   LIBMEMCACHED_MEMCACHED_DELETE_START();
 
+  if (key_length == 0)
+    return MEMCACHED_NO_KEY_PROVIDED;
+
   if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
 
-  server_key= memcached_generate_hash(ptr, key, key_length);
-
-  if ((rc= memcached_connect(ptr, server_key)) != MEMCACHED_SUCCESS)
-    return rc;
-
+  server_key= memcached_generate_hash(ptr, master_key, master_key_length);
 
   if (expiration)
     send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
@@ -39,27 +47,22 @@ 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))
   {
     rc= MEMCACHED_SUCCESS;
-    memcached_server_response_increment(ptr, server_key);
   }
   else
   {
-    rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+    rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL, server_key);
     if (rc == MEMCACHED_DELETED)
       rc= MEMCACHED_SUCCESS;
   }
 
-  LIBMEMCACHED_MEMCACHED_DELETE_END();
-
 error:
+  LIBMEMCACHED_MEMCACHED_DELETE_END();
   return rc;
 }