X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_delete.c;h=64036c7998bbb84a0034765986853b799b099292;hb=8996c21d87b51d6bcc72efd93cbf83cc559498a5;hp=d24c0f82a0b7d16ffff58e922a09a05f97817010;hpb=875200dc0c5668bba4f8a68b487f9d2f2a1eedb0;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_delete.c b/lib/memcached_delete.c
index d24c0f82..64036c79 100644
--- a/lib/memcached_delete.c
+++ b/lib/memcached_delete.c
@@ -1,13 +1,15 @@
-#include <memcached.h>
+#include "common.h"
 
 memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
                                   time_t expiration)
 {
-  size_t send_length;
+  size_t send_length, sent_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
 
+  LIBMEMCACHED_MEMCACHED_DELETE_START();
+
   rc= memcached_connect(ptr);
 
   if (rc != MEMCACHED_SUCCESS)
@@ -23,8 +25,19 @@ memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
     send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                           "delete %.*s\r\n", (int)key_length, key);
 
-  if ((write(ptr->hosts[server_key].fd, buffer, send_length) == -1))
+  if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+    return MEMCACHED_WRITE_FAILURE;
+
+  sent_length= send(ptr->hosts[server_key].fd, buffer, send_length, 0);
+
+  if (sent_length == -1 || sent_length != send_length)
     return MEMCACHED_WRITE_FAILURE;
 
-  return memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+  rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+  LIBMEMCACHED_MEMCACHED_DELETE_END();
+
+  if (rc == MEMCACHED_DELETED)
+    rc= MEMCACHED_SUCCESS;
+
+  return rc;
 }