Fix prefix key so that it is not statically built.

[m6w6/libmemcached] / libmemcached / delete.c

diff --git a/libmemcached/delete.c b/libmemcached/delete.c
index ef1fa6da328e499e94d931e608f88db2ac6e5c81..2f205cd6f293b42d0a148bdf30995018a0a3d810 100644 (file)
--- a/libmemcached/delete.c
+++ b/libmemcached/delete.c
@@ -92,8 +92,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",
-                                (int)ptr->prefix_key_length,
-                                ptr->prefix_key,
+                                memcached_print_array(ptr->prefix_key),
                                 (int) key_length, key,
                                 (uint32_t)expiration,
                                 no_reply ? " noreply" :"" );
@@ -103,8 +102,7 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr,
     {
       send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
                             "delete %.*s%.*s%s\r\n",
-                            (int)ptr->prefix_key_length,
-                            ptr->prefix_key,
+                            memcached_print_array(ptr->prefix_key),
                             (int)key_length, key, no_reply ? " noreply" :"");
     }
 
@@ -163,9 +161,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 + ptr->prefix_key_length));
+  request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(ptr->prefix_key)));
   request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
-  request.message.header.request.bodylen= htonl((uint32_t)(key_length + ptr->prefix_key_length));
+  request.message.header.request.bodylen= htonl((uint32_t)(key_length + memcached_array_size(ptr->prefix_key)));
 
   if (ptr->flags.use_udp && ! flush)
   {
@@ -179,7 +177,7 @@ static inline memcached_return_t binary_delete(memcached_st *ptr,
   struct libmemcached_io_vector_st vector[]=
   {
     { .length= sizeof(request.bytes), .buffer= request.bytes},
-    { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key },
+    { .length= memcached_array_size(ptr->prefix_key), .buffer= memcached_array_string(ptr->prefix_key) },
     { .length= key_length, .buffer= key },
   };