Flip structure declation.

diff --git a/libmemcached/auto.cc b/libmemcached/auto.cc
index a73685ac49856668e8aa12bbf70f9f5b58e27553..b2e4f534def078ece54f55682561b3b0eb765eac 100644 (file)
--- a/libmemcached/auto.cc
+++ b/libmemcached/auto.cc
@@ -145,9 +145,9 @@ static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd,
 
   struct libmemcached_io_vector_st vector[]=
   {
-    { sizeof(request.bytes), request.bytes },
-    { memcached_array_size(ptr->_namespace), memcached_array_string(ptr->_namespace) },
-    { key_length, key }
+    { request.bytes, sizeof(request.bytes) },
+    { memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) },
+    { key, key_length }
   };
 
   memcached_return_t rc;
@@ -158,7 +158,9 @@ static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd,
   }
 
   if (no_reply)
+  {
     return MEMCACHED_SUCCESS;
+  }
 
   return memcached_response(instance, (char*)value, sizeof(*value), NULL);
 }

diff --git a/libmemcached/delete.cc b/libmemcached/delete.cc
index 6be7e224ec70e52ee1502098b7779ac1fda02f4d..91799bbd3397d5932d0b9c2a84de6679b5c2ebb0 100644 (file)
--- a/libmemcached/delete.cc
+++ b/libmemcached/delete.cc
@@ -178,9 +178,9 @@ 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->_namespace), memcached_array_string(ptr->_namespace) },
-    { key_length, key },
+    { request.bytes, sizeof(request.bytes) },
+    { memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) },
+    { key, key_length }
   };
 
   memcached_return_t rc= MEMCACHED_SUCCESS;

diff --git a/libmemcached/exist.cc b/libmemcached/exist.cc
index b8d4b0d876a325255d6ec9d36a94098f75b087de..b68ba466db760fab7683c66d2c61c5a884575a69 100644 (file)
--- a/libmemcached/exist.cc
+++ b/libmemcached/exist.cc
@@ -40,14 +40,14 @@ static memcached_return_t ascii_exist(memcached_st *memc, memcached_server_write
 {
   struct libmemcached_io_vector_st vector[]=
   {
-    { sizeof("add ") -1, "add " },
-    { memcached_array_size(memc->_namespace), memcached_array_string(memc->_namespace) },
-    { key_length, key },
-    { sizeof(" 0") -1, " 0" },
-    { sizeof(" 2678400") -1, " 2678400" },
-    { sizeof(" 0") -1, " 0" },
-    { 2, "\r\n" },
-    { 2, "\r\n" }
+    { memcached_literal_param("add ") },
+    { memcached_array_string(memc->_namespace), memcached_array_size(memc->_namespace) },
+    { key, key_length },
+    { memcached_literal_param(" 0") },
+    { memcached_literal_param(" 2678400") },
+    { memcached_literal_param(" 0") },
+    { memcached_literal_param("\r\n") },
+    { memcached_literal_param("\r\n") }
   };
 
   /* Send command header */
@@ -89,9 +89,9 @@ static memcached_return_t binary_exist(memcached_st *memc, memcached_server_writ
 
   struct libmemcached_io_vector_st vector[]=
   {
-    { send_length, request.bytes },
-    { memcached_array_size(memc->_namespace), memcached_array_string(memc->_namespace) },
-    { key_length, key }
+    { request.bytes, send_length },
+    { memcached_array_string(memc->_namespace), memcached_array_size(memc->_namespace) },
+    { key, key_length }
   };
 
   /* write the header */

diff --git a/libmemcached/get.cc b/libmemcached/get.cc
index 3c91b495fc527f009cdb8dd5b68023d198fae5e9..a78d73efecc2ef07d985795c6700ec09001ac3e4 100644 (file)
--- a/libmemcached/get.cc
+++ b/libmemcached/get.cc
@@ -298,10 +298,10 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
 
     struct libmemcached_io_vector_st vector[]=
     {
-      { get_command_length, get_command },
-      { memcached_array_size(ptr->_namespace), memcached_array_string(ptr->_namespace) },
-      { key_length[x], keys[x] },
-      { 1, " " }
+      { get_command, get_command_length },
+      { memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) },
+      { keys[x], key_length[x] },
+      { memcached_literal_param(" ") }
     };
 
 
@@ -500,9 +500,9 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
 
     struct libmemcached_io_vector_st vector[]=
     {
-      { sizeof(request.bytes), request.bytes },
-      { memcached_array_size(ptr->_namespace), memcached_array_string(ptr->_namespace) },
-      { key_length[x], keys[x] }
+      { request.bytes, sizeof(request.bytes) },
+      { memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) },
+      { keys[x], key_length[x] }
     };
 
     if (memcached_io_writev(instance, vector, 3, flush) == -1)
@@ -634,9 +634,9 @@ static memcached_return_t replication_binary_mget(memcached_st *ptr,
      */
       struct libmemcached_io_vector_st vector[]=
       {
-        { sizeof(request.bytes), request.bytes },
-        { memcached_array_size(ptr->_namespace), memcached_array_string(ptr->_namespace) },
-        { key_length[x], keys[x] }
+        { request.bytes, sizeof(request.bytes) },
+        { memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) },
+        { keys[x], key_length[x] }
       };
 
       if (memcached_io_writev(instance, vector, 3, true) == -1)
@@ -652,7 +652,9 @@ static memcached_return_t replication_binary_mget(memcached_st *ptr,
     }
 
     if (success)
+    {
       break;
+    }
   }
 
   return rc;

diff --git a/libmemcached/io.cc b/libmemcached/io.cc
index e97a6c88ed68825ea6cbdd14629871e39329408c..c6d647be64cdaf73efcbd21d319ea79a7f88e4a7 100644 (file)
--- a/libmemcached/io.cc
+++ b/libmemcached/io.cc
@@ -610,13 +610,10 @@ memcached_return_t memcached_io_slurp(memcached_server_write_instance_st ptr)
 static ssize_t _io_write(memcached_server_write_instance_st ptr,
                          const void *buffer, size_t length, bool with_flush)
 {
-  size_t original_length;
-  const char* buffer_ptr;
-
   WATCHPOINT_ASSERT(ptr->fd != INVALID_SOCKET);
 
-  original_length= length;
-  buffer_ptr= static_cast<const char *>(buffer);
+  size_t original_length= length;
+  const char *buffer_ptr= static_cast<const char *>(buffer);
 
   while (length)
   {

diff --git a/libmemcached/io.h b/libmemcached/io.h
index 3591de922badf79d8ca27e81457053b420abeea8..6d3e2fa248831f4c7bceec1d6d9302eb0e475a16 100644 (file)
--- a/libmemcached/io.h
+++ b/libmemcached/io.h
@@ -60,8 +60,8 @@ struct udp_datagram_header_st
 
 struct libmemcached_io_vector_st
 {
-  size_t length;
   const void *buffer;
+  size_t length;
 };
 
 #ifdef __cplusplus

diff --git a/libmemcached/sasl.cc b/libmemcached/sasl.cc
index 3aefb701f9bfd93cb0fa343f3cf7feeff5752f4c..32906cc8a8858e82056d8b87c822afd53147be0f 100644 (file)
--- a/libmemcached/sasl.cc
+++ b/libmemcached/sasl.cc
@@ -231,9 +231,9 @@ memcached_return_t memcached_sasl_authenticate_connection(memcached_server_st *s
 
     struct libmemcached_io_vector_st vector[]=
     {
-      { sizeof(request.bytes), request.bytes },
-      { keylen, chosenmech },
-      { len, data }
+      { request.bytes, sizeof(request.bytes) },
+      { chosenmech, keylen },
+      { data, len }
     };
 
     if (memcached_io_writev(server, vector, 3, true) == -1)

diff --git a/libmemcached/stats.cc b/libmemcached/stats.cc
index 88e2d101675fc61c55abbb39d7a8c44752263341..3b664802de20142d93254133ee01609ad827e593 100644 (file)
--- a/libmemcached/stats.cc
+++ b/libmemcached/stats.cc
@@ -333,8 +333,8 @@ static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
 
     struct libmemcached_io_vector_st vector[]=
     {
-      { sizeof(request.bytes), request.bytes },
-      { len, args }
+      { request.bytes, sizeof(request.bytes) },
+      { args, len }
     };
 
     if (memcached_vdo(instance, vector, 2, true) != MEMCACHED_SUCCESS)

diff --git a/libmemcached/storage.cc b/libmemcached/storage.cc
index 703b0e3081da635fcb58490e6e32ced7bdd86d1a..12c292758cdd8fd609afb76e5fd891ceccab86c8 100644 (file)
--- a/libmemcached/storage.cc
+++ b/libmemcached/storage.cc
@@ -162,10 +162,10 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
 
   struct libmemcached_io_vector_st vector[]=
   {
-    { send_length, request.bytes },
-    { memcached_array_size(ptr->_namespace), memcached_array_string(ptr->_namespace) },
-    { key_length, key },
-    { value_length, value }
+    { request.bytes, send_length },
+    { memcached_array_string(ptr->_namespace),  memcached_array_size(ptr->_namespace) },
+    { key, key_length },
+    { value, value_length }
   };
 
   /* write the header */
@@ -307,9 +307,9 @@ static memcached_return_t memcached_send_ascii(memcached_st *ptr,
   {
     struct libmemcached_io_vector_st vector[]=
     {
-      { write_length, buffer },
-      { value_length, value },
-      { 2, "\r\n" }
+      { buffer, write_length },
+      { value, value_length },
+      { memcached_literal_param("\r\n") }
     };
 
     if (ptr->flags.buffer_requests && verb == SET_OP)