Refactor of response code. All of it has been streamlined to allow for multi

[m6w6/libmemcached] / lib / memcached_delete.c

diff --git a/lib/memcached_delete.c b/lib/memcached_delete.c
index 0c36aaebb172b40fcb6c8ed643b109db02aed602..519e52bec6fea58f6d304bf187d289f61559acec 100644 (file)
--- 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, 
@@ -45,11 +54,10 @@ memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
   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;
   }