X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_flush.c;h=33cc6eb65ce378ebba3e32d8178c751cb70ce4ce;hb=336c207e439cff2f6c4ae904c798c7f3f33b3e52;hp=9b9c4baca91c3efb181961abef7ecf69a2aa6d62;hpb=85a66fec1e07e874e5410ce56a2976d68fbe14fd;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_flush.c b/lib/memcached_flush.c
index 9b9c4bac..33cc6eb6 100644
--- a/lib/memcached_flush.c
+++ b/lib/memcached_flush.c
@@ -3,17 +3,14 @@
 memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
 {
   unsigned int x;
-  size_t send_length, sent_length;
+  size_t send_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   LIBMEMCACHED_MEMCACHED_FLUSH_START();
 
-  rc= memcached_connect(ptr);
+  if (ptr->number_of_hosts == 0)
+    return MEMCACHED_NO_SERVERS;
 
-  if (rc != MEMCACHED_SUCCESS)
-    rc= MEMCACHED_SOME_ERRORS;
-
-  memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
     if (expiration)
@@ -23,22 +20,12 @@ memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
       send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                             "flush_all\r\n");
 
-    if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
-      return MEMCACHED_WRITE_FAILURE;
-
-    sent_length= memcached_io_write(ptr, x, buffer, send_length, 1);
-
-    if (sent_length == -1 || sent_length != send_length)
-      return MEMCACHED_WRITE_FAILURE;
-
-    if (ptr->flags & MEM_NO_BLOCK)
-      WATCHPOINT;
-    rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x);
+    rc= memcached_do(ptr, x, buffer, send_length, 1);
 
-    if (rc != MEMCACHED_SUCCESS)
-      rc= MEMCACHED_SOME_ERRORS;
+    if (rc == MEMCACHED_SUCCESS)
+      (void)memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL, x);
   }
 
   LIBMEMCACHED_MEMCACHED_FLUSH_END();
-  return rc;
+  return MEMCACHED_SUCCESS;
 }