Add support for query_id, and fixes a few cases where programmer error can

[awesomized/libmemcached] / libmemcached / quit.c

diff --git a/libmemcached/quit.c b/libmemcached/quit.c
index a82470000ff6496477e0cea7fcbc5f58dd62c57b..6d72906cb8022a92ed69f2ab7dfafb0bd616eba8 100644 (file)
--- a/libmemcached/quit.c
+++ b/libmemcached/quit.c
@@ -83,16 +83,23 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death)
   }
 }
 
-void memcached_quit(memcached_st *ptr)
+void send_quit(memcached_st *ptr)
 {
-  if (memcached_server_count(ptr))
+  for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
   {
-    for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
-    {
-      memcached_server_write_instance_st instance=
-        memcached_server_instance_fetch(ptr, x);
+    memcached_server_write_instance_st instance=
+      memcached_server_instance_fetch(ptr, x);
 
-      memcached_quit_server(instance, false);
-    }
+    memcached_quit_server(instance, false);
+  }
+}
+
+void memcached_quit(memcached_st *ptr)
+{
+  if (initialize_query(ptr) != MEMCACHED_SUCCESS)
+  {
+    return;
   }
+
+  send_quit(ptr);
 }