Update build bits.

[m6w6/libmemcached] / libmemcached / delete.cc

diff --git a/libmemcached/delete.cc b/libmemcached/delete.cc
index e473851744fdeeacac1a9712acdf5bd93d25042f..ea3b602539cf557558869e2feb43a67360caf78d 100644 (file)
--- a/libmemcached/delete.cc
+++ b/libmemcached/delete.cc
@@ -134,7 +134,7 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr,
           }
           send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
                                 "delete %.*s%.*s %u%s\r\n",
-                                memcached_print_array(ptr->prefix_key),
+                                memcached_print_array(ptr->_namespace),
                                 (int) key_length, key,
                                 (uint32_t)expiration,
                                 no_reply ? " noreply" :"" );
@@ -144,13 +144,14 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr,
     {
       send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
                             "delete %.*s%.*s%s\r\n",
-                            memcached_print_array(ptr->prefix_key),
+                            memcached_print_array(ptr->_namespace),
                             (int)key_length, key, no_reply ? " noreply" :"");
     }
 
     if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE || send_length < 0)
     {
-      rc= MEMCACHED_WRITE_FAILURE;
+      rc=  memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, 
+                               memcached_literal_param("snprintf(MEMCACHED_DEFAULT_COMMAND_SIZE)"));
       goto error;
     }
 
@@ -160,7 +161,9 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr,
         return MEMCACHED_WRITE_FAILURE;
 
       if (send_length + instance->write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH)
+      {
         memcached_io_write(instance, NULL, 0, true);
+      }
     }
 
     rc= memcached_do(instance, buffer, (size_t)send_length, to_write);
@@ -208,9 +211,9 @@ static inline memcached_return_t binary_delete(memcached_st *ptr,
   {
     request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETE;
   }
-  request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(ptr->prefix_key)));
+  request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(ptr->_namespace)));
   request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
-  request.message.header.request.bodylen= htonl((uint32_t)(key_length + memcached_array_size(ptr->prefix_key)));
+  request.message.header.request.bodylen= htonl((uint32_t)(key_length + memcached_array_size(ptr->_namespace)));
 
   if (ptr->flags.use_udp && ! flush)
   {
@@ -225,7 +228,7 @@ static inline memcached_return_t binary_delete(memcached_st *ptr,
   struct libmemcached_io_vector_st vector[]=
   {
     { sizeof(request.bytes), request.bytes},
-    { memcached_array_size(ptr->prefix_key), memcached_array_string(ptr->prefix_key) },
+    { memcached_array_size(ptr->_namespace), memcached_array_string(ptr->_namespace) },
     { key_length, key },
   };