X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fdelete.c;h=84a34271b0c01cb779a6c4f1c8c03c20e99c2ad0;hb=c63b3f26c9e8d0214d3e1c70fb761f7700d61d2d;hp=da91f7036edabf4c67e175db19861318108a62fd;hpb=519261ca98528ebc5d854ed839f400aa03a3dc5c;p=awesomized%2Flibmemcached

diff --git a/libmemcached/delete.c b/libmemcached/delete.c
index da91f703..84a34271 100644
--- a/libmemcached/delete.c
+++ b/libmemcached/delete.c
@@ -45,7 +45,7 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr,
 
   if (ptr->flags.binary_protocol)
   {
-    likely (!expiration)
+    likely (! expiration)
     {
       rc= binary_delete(ptr, server_key, key, key_length, to_write);
     }
@@ -99,11 +99,13 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr,
        }
     }
     else
-       send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
-                                      "delete %.*s%.*s%s\r\n",
-                                      (int)ptr->prefix_key_length,
-                                      ptr->prefix_key,
-                                      (int)key_length, key, no_reply ? " noreply" :"");
+    {
+      send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
+                                     "delete %.*s%.*s%s\r\n",
+                                     (int)ptr->prefix_key_length,
+                                     ptr->prefix_key,
+                                     (int)key_length, key, no_reply ? " noreply" :"");
+    }
 
     if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
     {
@@ -126,7 +128,9 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr,
     goto error;
 
   if (! to_write)
+  {
     rc= MEMCACHED_BUFFERED;
+  }
   else if (!no_reply)
   {
     rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
@@ -158,9 +162,9 @@ static inline memcached_return_t binary_delete(memcached_st *ptr,
     request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETEQ;
   else
     request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETE;
-  request.message.header.request.keylen= htons((uint16_t)key_length);
+  request.message.header.request.keylen= htons((uint16_t)(key_length + ptr->prefix_key_length));
   request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
-  request.message.header.request.bodylen= htonl((uint32_t) key_length);
+  request.message.header.request.bodylen= htonl((uint32_t)(key_length + ptr->prefix_key_length));
 
   if (ptr->flags.use_udp && ! flush)
   {
@@ -171,12 +175,16 @@ static inline memcached_return_t binary_delete(memcached_st *ptr,
       memcached_io_write(instance, NULL, 0, true);
   }
 
+  struct libmemcached_io_vector_st vector[]=
+  {
+    { .length= sizeof(request.bytes), .buffer= request.bytes},
+    { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key },
+    { .length= key_length, .buffer= key },
+  };
+
   memcached_return_t rc= MEMCACHED_SUCCESS;
 
-  if (((rc= memcached_do(instance, request.bytes,
-                         sizeof(request.bytes), false)) != MEMCACHED_SUCCESS) ||
-      (memcached_io_write(instance, key,
-                          key_length, flush) == -1))
+  if ((rc= memcached_vdo(instance, vector,  3, flush)) != MEMCACHED_SUCCESS)
   {
     memcached_io_reset(instance);
     rc= (rc == MEMCACHED_SUCCESS) ? MEMCACHED_WRITE_FAILURE : rc;
@@ -196,9 +204,7 @@ static inline memcached_return_t binary_delete(memcached_st *ptr,
 
       replica= memcached_server_instance_fetch(ptr, server_key);
 
-      if ((memcached_do(replica, (const char*)request.bytes,
-                        sizeof(request.bytes), false) != MEMCACHED_SUCCESS) ||
-          (memcached_io_write(replica, key, key_length, flush) == -1))
+      if (memcached_vdo(replica, vector, 3, flush) != MEMCACHED_SUCCESS)
       {
         memcached_io_reset(replica);
       }