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 2b232fe75255b2aeb11d9967713f14bfe94e0021..be0040a4197f6b621f0a900e662c92117ea8b89b 100644 (file)
--- a/libmemcached/storage.c
+++ b/libmemcached/storage.c
@@ -145,48 +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;
-  }
-
-
-  struct __write_vector_st vector[]= 
-  {
-    { .length= write_length, .buffer= buffer },
-    { .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;
-  }
+    struct __write_vector_st vector[]= 
+    {
+      { .length= write_length, .buffer= buffer },
+      { .length= value_length, .buffer= value },
+      { .length= 2, .buffer= "\r\n" }
+    }; 
 
-  /* Send command header */
-  rc=  memcached_vdo(instance, vector, 3, to_write);
-  if (rc == MEMCACHED_SUCCESS)
-  {
+    if (ptr->flags.buffer_requests && verb == SET_OP)
+    {
+      to_write= false;
+    }
+    else
+    {
+      to_write= true;
+    }
 
-  if (ptr->flags.no_reply)
-    return (to_write == false) ? MEMCACHED_BUFFERED : MEMCACHED_SUCCESS;
+    /* Send command header */
+    rc=  memcached_vdo(instance, vector, 3, to_write);
+    if (rc == MEMCACHED_SUCCESS)
+    {
 
-  if (to_write == false)
-    return MEMCACHED_BUFFERED;
+      if (ptr->flags.no_reply)
+        return (to_write == false) ? MEMCACHED_BUFFERED : MEMCACHED_SUCCESS;
 
-  rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+      if (to_write == false)
+        return MEMCACHED_BUFFERED;
 
-  if (rc == MEMCACHED_STORED)
-    return MEMCACHED_SUCCESS;
-  else
-    return rc;
-  }
+      rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
 
-error:
+      if (rc == MEMCACHED_STORED)
+        return MEMCACHED_SUCCESS;
+      else
+        return rc;
+    }
+  }
 
-  memcached_io_reset(instance);
+  if (rc == MEMCACHED_WRITE_FAILURE)
+    memcached_io_reset(instance);
 
   return rc;
 }