X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_delete.c;h=ecd7d8dc1b203cad509f1616939981b1b0a1a48a;hb=257f0547823cf6b18473ba8bd2580b38235f6d79;hp=b50aaef0f9be5c7fdb4c459d0ee79b31f0c3f22d;hpb=f4ff3ba0a9f212ac1323fc056d61fefd3782093c;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_delete.c b/lib/memcached_delete.c
index b50aaef0..ecd7d8dc 100644
--- a/lib/memcached_delete.c
+++ b/lib/memcached_delete.c
@@ -1,4 +1,4 @@
-#include <memcached.h>
+#include "common.h"
 
 memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
                                   time_t expiration)
@@ -8,6 +8,8 @@ memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
 
+  LIBMEMCACHED_MEMCACHED_DELETE_START();
+
   rc= memcached_connect(ptr);
 
   if (rc != MEMCACHED_SUCCESS)
@@ -24,12 +26,26 @@ memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
                           "delete %.*s\r\n", (int)key_length, key);
 
   if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
-    return MEMCACHED_WRITE_FAILURE;
+  {
+    rc= MEMCACHED_WRITE_FAILURE;
+    goto error;
+  }
 
-  sent_length= write(ptr->hosts[server_key].fd, buffer, send_length);
+  sent_length= send(ptr->hosts[server_key].fd, buffer, send_length, 0);
 
   if (sent_length == -1 || sent_length != send_length)
-    return MEMCACHED_WRITE_FAILURE;
+  {
+    rc= MEMCACHED_WRITE_FAILURE;
+    goto error;
+  }
+
+  rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+
+  if (rc == MEMCACHED_DELETED)
+    rc= MEMCACHED_SUCCESS;
+
+  LIBMEMCACHED_MEMCACHED_DELETE_END();
 
-  return memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+error:
+  return rc;
 }