X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_delete.c;h=b3ae560d14253bceaac1b7719ed821b40aca0e74;hb=8a86b578acc594d37a8638e3e0afba1286c4b6ca;hp=0c36aaebb172b40fcb6c8ed643b109db02aed602;hpb=5a6b411afb61c7d14aee3f52037f719c42072160;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_delete.c b/lib/memcached_delete.c
index 0c36aaeb..b3ae560d 100644
--- a/lib/memcached_delete.c
+++ b/lib/memcached_delete.c
@@ -2,6 +2,15 @@
 
 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;
@@ -17,7 +26,7 @@ memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
   if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
 
-  server_key= memcached_generate_hash(ptr, key, key_length);
+  server_key= memcached_generate_hash(ptr, master_key, master_key_length);
 
   if (expiration)
     send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
@@ -33,23 +42,19 @@ memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
     goto error;
   }
 
-  if ((ptr->flags & MEM_NO_BLOCK))
-    to_write= 0;
-  else
-    to_write= 1;
+  to_write= (ptr->flags & MEM_BUFFER_REQUESTS) ? 0 : 1;
 
-  rc= memcached_do(ptr, server_key, buffer, send_length, to_write);
+  rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, to_write);
   if (rc != MEMCACHED_SUCCESS)
     goto error;
 
-  if ((ptr->flags & MEM_NO_BLOCK))
+  if ((ptr->flags & MEM_BUFFER_REQUESTS))
   {
-    rc= MEMCACHED_SUCCESS;
-    memcached_server_response_increment(ptr, server_key);
+    rc= MEMCACHED_BUFFERED;
   }
   else
   {
-    rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+    rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
     if (rc == MEMCACHED_DELETED)
       rc= MEMCACHED_SUCCESS;
   }