Merge working tree with build tree.

[m6w6/libmemcached] / libmemcached / quit.cc

diff --git a/libmemcached/quit.cc b/libmemcached/quit.cc
index 90a97e454ebb6d8caf4183d2379aa1e59e33ee43..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") }
         };
@@ -140,7 +140,8 @@ void send_quit(memcached_st *ptr)
 
 void memcached_quit(memcached_st *ptr)
 {
-  if (memcached_failed(initialize_query(ptr)))
+  memcached_return_t rc;
+  if (memcached_failed(rc= initialize_query(ptr, true)))
   {
     return;
   }