X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fquit.c;h=ebeffa5c0bd2f134a039ed881fa78f87152f5e67;hb=56bb95c23210147d45b792e4e494e995d9de76dc;hp=dc11e97fcea5e65356c5775ca5147d2a01b733ad;hpb=04e768d414826cdea61b7b5f7e7e51b3c791feb5;p=m6w6%2Flibmemcached

diff --git a/libmemcached/quit.c b/libmemcached/quit.c
index dc11e97f..ebeffa5c 100644
--- a/libmemcached/quit.c
+++ b/libmemcached/quit.c
@@ -24,11 +24,11 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
         request.message.header.request.magic = PROTOCOL_BINARY_REQ;
         request.message.header.request.opcode = PROTOCOL_BINARY_CMD_QUIT;
         request.message.header.request.datatype = PROTOCOL_BINARY_RAW_BYTES;
-        rc= memcached_do(ptr, request.bytes, sizeof(request.bytes), 1);
+        rc= memcached_do(ptr, request.bytes, sizeof(request.bytes), true);
       }
       else
       {
-        rc= memcached_do(ptr, "quit\r\n", 6, 1);
+        rc= memcached_do(ptr, "quit\r\n", sizeof("quit\r\n"), true);
       }
 
       WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_FETCH_NOTFINISHED);
@@ -69,15 +69,19 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
 
 void memcached_quit(memcached_st *ptr)
 {
-  unsigned int x;
+  uint32_t x;
 
-  if (ptr->hosts == NULL ||
-      ptr->number_of_hosts == 0)
+  if (memcached_server_count(ptr) == 0)
     return;
 
-  if (ptr->hosts && ptr->number_of_hosts)
+  if (memcached_server_count(ptr))
   {
-    for (x= 0; x < ptr->number_of_hosts; x++)
-      memcached_quit_server(&ptr->hosts[x], 0);
+    for (x= 0; x < memcached_server_count(ptr); x++)
+    {
+      memcached_server_instance_st *instance=
+        memcached_server_instance_fetch(ptr, x);
+
+      memcached_quit_server(instance, 0);
+    }
   }
 }