Style change

diff --git a/libmemcached/auto.cc b/libmemcached/auto.cc
index 256a849aec049a3a88de039d5db6e38acf640bc9..c1764c4d5b5753a69c0796904391bee3ad8796e2 100644 (file)
--- a/libmemcached/auto.cc
+++ b/libmemcached/auto.cc
@@ -53,7 +53,7 @@ static memcached_return_t text_incr_decr(memcached_server_write_instance_st inst
                                memcached_literal_param("snprintf(MEMCACHED_DEFAULT_COMMAND_SIZE)"));
   }
 
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
     { memcached_literal_param("incr ") },
     { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) },
@@ -119,7 +119,7 @@ static memcached_return_t binary_incr_decr(memcached_server_write_instance_st in
   request.message.body.initial= memcached_htonll(initial);
   request.message.body.expiration= htonl((uint32_t) expiration);
 
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
     { request.bytes, sizeof(request.bytes) },
     { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) },

diff --git a/libmemcached/delete.cc b/libmemcached/delete.cc
index 99f3970bcfcedfaf54856d0e527e83fb5d5b6543..1c4aba6cea26181a846d73428580096e09cc1da0 100644 (file)
--- a/libmemcached/delete.cc
+++ b/libmemcached/delete.cc
@@ -51,7 +51,7 @@ static inline memcached_return_t ascii_delete(memcached_server_write_instance_st
                                               const bool reply,
                                               const bool flush)
 {
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
     { memcached_literal_param("delete ") },
     { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) },
@@ -115,7 +115,7 @@ static inline memcached_return_t binary_delete(memcached_server_write_instance_s
     }
   }
 
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
     { request.bytes, sizeof(request.bytes) },
     { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) },

diff --git a/libmemcached/dump.cc b/libmemcached/dump.cc
index 6e18747850c70b12b9dda68ba03325e6633d9d7e..830c3ff405c02d66d67e3a6600bfe87d99813081 100644 (file)
--- a/libmemcached/dump.cc
+++ b/libmemcached/dump.cc
@@ -64,7 +64,7 @@ static memcached_return_t ascii_dump(memcached_st *ptr, memcached_dump_fn *callb
                                    memcached_literal_param("snprintf(MEMCACHED_DEFAULT_COMMAND_SIZE)"));
       }
 
-      struct libmemcached_io_vector_st vector[]=
+      libmemcached_io_vector_st vector[]=
       {
         { memcached_literal_param("stats cachedump ") },
         { buffer, buffer_length },

diff --git a/libmemcached/exist.cc b/libmemcached/exist.cc
index e9e6208b88de521cf1258cc12ff7e61fb42c3fee..6903f83bcd612e1adb87335377e69008d197130b 100644 (file)
--- a/libmemcached/exist.cc
+++ b/libmemcached/exist.cc
@@ -38,7 +38,7 @@
 
 static memcached_return_t ascii_exist(memcached_st *memc, memcached_server_write_instance_st instance, const char *key, size_t key_length)
 {
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
     { memcached_literal_param("add ") },
     { memcached_array_string(memc->_namespace), memcached_array_size(memc->_namespace) },
@@ -93,7 +93,7 @@ static memcached_return_t binary_exist(memcached_st *memc, memcached_server_writ
                                                             +memcached_array_size(memc->_namespace)
                                                             +request.message.header.request.extlen));
 
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
     { request.bytes, send_length },
     { memcached_array_string(memc->_namespace), memcached_array_size(memc->_namespace) },

diff --git a/libmemcached/flush.cc b/libmemcached/flush.cc
index f434b9176fec0798af67a5fdacee9daf041820b4..44a1429afe8c0cbd7ace71f2cccea2f8e8863c01 100644 (file)
--- a/libmemcached/flush.cc
+++ b/libmemcached/flush.cc
@@ -82,7 +82,7 @@ static memcached_return_t memcached_flush_textual(memcached_st *ptr,
                                memcached_literal_param("snprintf(MEMCACHED_DEFAULT_COMMAND_SIZE)"));
   }
 
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
     { memcached_literal_param("flush_all ") },
     { buffer, send_length },
@@ -143,7 +143,7 @@ static memcached_return_t memcached_flush_binary(memcached_st *ptr,
       request.message.header.request.opcode= PROTOCOL_BINARY_CMD_FLUSHQ;
     }
 
-    struct libmemcached_io_vector_st vector[]=
+    libmemcached_io_vector_st vector[]=
     {
       { request.bytes, sizeof(request.bytes) }
     };

diff --git a/libmemcached/get.cc b/libmemcached/get.cc
index a67e7618c8448867de77b973745cebd042f4518b..814c5bf7aa6926782f4f43ea5bfc5a90d8e93f9b 100644 (file)
--- a/libmemcached/get.cc
+++ b/libmemcached/get.cc
@@ -303,7 +303,7 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
 
     instance= memcached_server_instance_fetch(ptr, server_key);
 
-    struct libmemcached_io_vector_st vector[]=
+    libmemcached_io_vector_st vector[]=
     {
       { get_command, get_command_length },
       { memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) },
@@ -517,7 +517,7 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
     request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
     request.message.header.request.bodylen= htonl((uint32_t)( key_length[x] + memcached_array_size(ptr->_namespace)));
 
-    struct libmemcached_io_vector_st vector[]=
+    libmemcached_io_vector_st vector[]=
     {
       { request.bytes, sizeof(request.bytes) },
       { memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) },
@@ -650,7 +650,7 @@ static memcached_return_t replication_binary_mget(memcached_st *ptr,
        * that we might have processed some of the responses etc. For now,
        * just make sure we work _correctly_
      */
-      struct libmemcached_io_vector_st vector[]=
+      libmemcached_io_vector_st vector[]=
       {
         { request.bytes, sizeof(request.bytes) },
         { memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) },

diff --git a/libmemcached/io.cc b/libmemcached/io.cc
index ae86fa217b9f2902f3b64db4939ce685b4f06853..2b463ec77b2a5568b8501289d276ff01c3581231 100644 (file)
--- a/libmemcached/io.cc
+++ b/libmemcached/io.cc
@@ -674,7 +674,7 @@ size_t io_vector_total_size(libmemcached_io_vector_st* vector, const size_t numb
 }
 
 ssize_t memcached_io_writev(memcached_server_write_instance_st ptr,
-                            const struct libmemcached_io_vector_st *vector,
+                            libmemcached_io_vector_st *vector,
                             size_t number_of, bool with_flush)
 {
   ssize_t total= 0;

diff --git a/libmemcached/io.hpp b/libmemcached/io.hpp
index d91150f8cd70e3cfdae5e9aa578b0a7c2ef1370b..4a7b3cf01447c3afc5b7339a851d50bd98a182d4 100644 (file)
--- a/libmemcached/io.hpp
+++ b/libmemcached/io.hpp
@@ -46,7 +46,7 @@ ssize_t memcached_io_write(memcached_server_write_instance_st ptr,
                            const void *buffer, size_t length, bool with_flush);
 
 ssize_t memcached_io_writev(memcached_server_write_instance_st ptr,
-                            const struct libmemcached_io_vector_st *vector,
+                            libmemcached_io_vector_st *vector,
                             size_t number_of, bool with_flush);
 
 memcached_return_t memcached_io_wait_for_write(memcached_server_write_instance_st ptr);

diff --git a/libmemcached/quit.cc b/libmemcached/quit.cc
index f228c881d9657778859e7a33af8532ba77c1c8d2..9aadd605f71ea802009686c1b20bb897507b2203 100644 (file)
--- a/libmemcached/quit.cc
+++ b/libmemcached/quit.cc
@@ -62,7 +62,7 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death)
         request.message.header.request.opcode = PROTOCOL_BINARY_CMD_QUIT;
         request.message.header.request.datatype = PROTOCOL_BINARY_RAW_BYTES;
 
-        struct libmemcached_io_vector_st vector[]=
+        libmemcached_io_vector_st vector[]=
         {
           { request.bytes, sizeof(request.bytes) }
         };
@@ -71,7 +71,7 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death)
       }
       else
       {
-        struct libmemcached_io_vector_st vector[]=
+        libmemcached_io_vector_st vector[]=
         {
           { memcached_literal_param("quit\r\n") }
         };

diff --git a/libmemcached/sasl.cc b/libmemcached/sasl.cc
index 2e9bdc635d547514f1ef557cd5642e2dfee602f7..77c5fdf7b664295df1c6a1e97e79b862e22f340d 100644 (file)
--- a/libmemcached/sasl.cc
+++ b/libmemcached/sasl.cc
@@ -229,7 +229,7 @@ memcached_return_t memcached_sasl_authenticate_connection(memcached_server_st *s
   do {
     /* send the packet */
 
-    struct libmemcached_io_vector_st vector[]=
+    libmemcached_io_vector_st vector[]=
     {
       { request.bytes, sizeof(request.bytes) },
       { chosenmech, keylen },

diff --git a/libmemcached/stats.cc b/libmemcached/stats.cc
index c01b2acc421d9e0cf3be6c800f81b0109913deb2..a0a965f1b9cba9cbb19ad2efb84b26bbeab4971a 100644 (file)
--- a/libmemcached/stats.cc
+++ b/libmemcached/stats.cc
@@ -360,7 +360,7 @@ static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
     request.message.header.request.keylen= htons(uint16_t(args_length));
     request.message.header.request.bodylen= htonl(uint32_t( args_length));
 
-    struct libmemcached_io_vector_st vector[]=
+    libmemcached_io_vector_st vector[]=
     {
       { request.bytes, sizeof(request.bytes) },
       { args, args_length }
@@ -374,7 +374,7 @@ static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
   }
   else
   {
-    struct libmemcached_io_vector_st vector[]=
+    libmemcached_io_vector_st vector[]=
     {
       { request.bytes, sizeof(request.bytes) }
     };
@@ -437,7 +437,7 @@ static memcached_return_t ascii_stats_fetch(memcached_stat_st *memc_stat,
                                             memcached_server_write_instance_st instance,
                                             struct local_context *check)
 {
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
     { memcached_literal_param("stats ") },
     { args, args_length },

diff --git a/libmemcached/storage.cc b/libmemcached/storage.cc
index 629b95dc411b47a2ee43cca5ec621e76d0c696bc..5453416f2aaf0d6a80abf4df11b163b80ff0c679 100644 (file)
--- a/libmemcached/storage.cc
+++ b/libmemcached/storage.cc
@@ -160,7 +160,7 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
     request.message.header.request.cas= memcached_htonll(cas);
   }
 
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
     { request.bytes, send_length },
     { memcached_array_string(ptr->_namespace),  memcached_array_size(ptr->_namespace) },
@@ -271,7 +271,7 @@ static memcached_return_t memcached_send_ascii(memcached_st *ptr,
     }
   }
 
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
     { storage_op_string(verb), strlen(storage_op_string(verb))},
     { memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) },

diff --git a/libmemcached/touch.cc b/libmemcached/touch.cc
index ac52b3a188b73e082079d0525873b21bf9ef6b02..ba73146f2458ef169d7507531b89faa186e316bd 100644 (file)
--- a/libmemcached/touch.cc
+++ b/libmemcached/touch.cc
@@ -50,7 +50,7 @@ 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[]=
   {
     { memcached_literal_param("touch ") },
     { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) },
@@ -82,7 +82,7 @@ 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[]=
   {
     { request.bytes, sizeof(request.bytes) },
     { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) },