X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Ftouch.cc;h=b7fa247532e41f32d46e4fe210c23a69688f4f49;hb=0792d5bdd0b2a352cce1a4cb084eca19b15acc56;hp=ab1f70231dc317b20c64682a320200916b94e416;hpb=099ae042fda3ce9faa22390dbef80179388c0bb0;p=m6w6%2Flibmemcached

diff --git a/libmemcached/touch.cc b/libmemcached/touch.cc
index ab1f7023..b7fa2475 100644
--- a/libmemcached/touch.cc
+++ b/libmemcached/touch.cc
@@ -50,8 +50,9 @@ static memcached_return_t ascii_touch(memcached_server_write_instance_st instanc
                                memcached_literal_param("snprintf(MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH)"));
   }
 
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
+    { NULL, 0 },
     { memcached_literal_param("touch ") },
     { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) },
     { key, key_length },
@@ -60,7 +61,7 @@ static memcached_return_t ascii_touch(memcached_server_write_instance_st instanc
   };
 
   memcached_return_t rc;
-  if (memcached_failed(rc= memcached_vdo(instance, vector, 5, true)))
+  if (memcached_failed(rc= memcached_vdo(instance, vector, 6, true)))
   {
     memcached_io_reset(instance);
     return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
@@ -82,15 +83,16 @@ static memcached_return_t binary_touch(memcached_server_write_instance_st instan
   request.message.header.request.bodylen= htonl((uint32_t)(key_length +memcached_array_size(instance->root->_namespace) +request.message.header.request.extlen));
   request.message.body.expiration= htonl((uint32_t) expiration);
 
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
+    { NULL, 0 },
     { request.bytes, sizeof(request.bytes) },
     { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) },
     { key, key_length }
   };
 
   memcached_return_t rc;
-  if (memcached_failed(rc= memcached_vdo(instance, vector, 3, true)))
+  if (memcached_failed(rc= memcached_vdo(instance, vector, 4, true)))
   {
     memcached_io_reset(instance);
     return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
@@ -114,14 +116,14 @@ memcached_return_t memcached_touch_by_key(memcached_st *ptr,
   LIBMEMCACHED_MEMCACHED_TOUCH_START();
 
   memcached_return_t rc;
-  if (memcached_failed(rc= initialize_query(ptr)))
+  if (memcached_failed(rc= initialize_query(ptr, true)))
   {
     return rc;
   }
 
   if (memcached_failed(rc= memcached_validate_key_length(key_length, ptr->flags.binary_protocol)))
   {
-    return memcached_set_error(*ptr, rc, MEMCACHED_AT);
+    return rc;
   }
 
   uint32_t server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length);