Fix issue with memcached_st structure being a different size based on

[awesomized/libmemcached] / libmemcached / storage.c

diff --git a/libmemcached/storage.c b/libmemcached/storage.c
index f152f832d7ea3f1dde2d5f0ea309a74b8c03b0a7..be0040a4197f6b621f0a900e662c92117ea8b89b 100644 (file)
--- a/libmemcached/storage.c
+++ b/libmemcached/storage.c
@@ -145,50 +145,47 @@ static inline memcached_return_t memcached_send(memcached_st *ptr,
   if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
   {
     rc= MEMCACHED_WRITE_FAILURE;
-    goto error;
-  }
-
-  /* Send command header */
-  rc=  memcached_do(instance, buffer, write_length, false);
-  if (rc != MEMCACHED_SUCCESS)
-    goto error;
-
-  if (ptr->flags.buffer_requests && verb == SET_OP)
-  {
-    to_write= false;
   }
   else
   {
-    to_write= true;
-  }
+    struct __write_vector_st vector[]= 
+    {
+      { .length= write_length, .buffer= buffer },
+      { .length= value_length, .buffer= value },
+      { .length= 2, .buffer= "\r\n" }
+    }; 
 
-  struct __write_vector_st vector[]= 
-  {
-    { .length= value_length, .buffer= value },
-    { .length= 2, .buffer= "\r\n" }
-  }; 
+    if (ptr->flags.buffer_requests && verb == SET_OP)
+    {
+      to_write= false;
+    }
+    else
+    {
+      to_write= true;
+    }
 
-  if (memcached_io_writev(instance, vector, 2, to_write) == -1)
-  {
-    rc= MEMCACHED_WRITE_FAILURE;
-    goto error;
-  }
+    /* Send command header */
+    rc=  memcached_vdo(instance, vector, 3, to_write);
+    if (rc == MEMCACHED_SUCCESS)
+    {
 
-  if (ptr->flags.no_reply)
-    return (to_write == false) ? MEMCACHED_BUFFERED : MEMCACHED_SUCCESS;
+      if (ptr->flags.no_reply)
+        return (to_write == false) ? MEMCACHED_BUFFERED : MEMCACHED_SUCCESS;
 
-  if (to_write == false)
-    return MEMCACHED_BUFFERED;
+      if (to_write == false)
+        return MEMCACHED_BUFFERED;
 
-  rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+      rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
 
-  if (rc == MEMCACHED_STORED)
-    return MEMCACHED_SUCCESS;
-  else
-    return rc;
+      if (rc == MEMCACHED_STORED)
+        return MEMCACHED_SUCCESS;
+      else
+        return rc;
+    }
+  }
 
-error:
-  memcached_io_reset(instance);
+  if (rc == MEMCACHED_WRITE_FAILURE)
+    memcached_io_reset(instance);
 
   return rc;
 }
@@ -488,6 +485,7 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
 
   struct __write_vector_st vector[]= 
   {
+    { .length= send_length, .buffer= request.bytes },
     { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key },
     { .length= key_length, .buffer= key },
     { .length= value_length, .buffer= value }
@@ -495,8 +493,7 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
 
   /* write the header */
   memcached_return_t rc;
-  if (((rc= memcached_do(server, (const char*)request.bytes, send_length, false)) != MEMCACHED_SUCCESS) ||
-      (memcached_io_writev(server, vector, 3, flush) == -1))
+  if ((rc= memcached_vdo(server, vector, 4, flush)) != MEMCACHED_SUCCESS)
   {
     memcached_io_reset(server);
     return (rc == MEMCACHED_SUCCESS) ? MEMCACHED_WRITE_FAILURE : rc;
@@ -516,8 +513,7 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
 
       instance= memcached_server_instance_fetch(ptr, server_key);
 
-      if ((memcached_do(instance, (const char*)request.bytes, send_length, false) != MEMCACHED_SUCCESS) ||
-          (memcached_io_writev(instance, vector, 3, flush) == -1))
+      if (memcached_vdo(instance, vector, 4, false) != MEMCACHED_SUCCESS)
       {
         memcached_io_reset(instance);
       }