Update for release 0.14

[awesomized/libmemcached] / lib / memcached_flush.c

diff --git a/lib/memcached_flush.c b/lib/memcached_flush.c
index a822f4ad64d05b07eb5b881c2c68f1112df59455..fa3dd8d8973eb9de56b925eea2177a973586aa7c 100644 (file)
--- a/lib/memcached_flush.c
+++ b/lib/memcached_flush.c
@@ -1,18 +1,16 @@
-#include <memcached.h>
+#include "common.h"
 
 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)
@@ -22,19 +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= write(ptr->hosts[x].fd, buffer, send_length);
-
-    if (sent_length == -1 || sent_length != send_length)
-      return MEMCACHED_WRITE_FAILURE;
-
-    rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x);
+    rc= memcached_do(&ptr->hosts[x], buffer, send_length, 1);
 
-    if (rc != MEMCACHED_SUCCESS)
-      rc= MEMCACHED_SOME_ERRORS;
+    if (rc == MEMCACHED_SUCCESS)
+      (void)memcached_response(&ptr->hosts[x], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
   }
 
-  return rc;
+  LIBMEMCACHED_MEMCACHED_FLUSH_END();
+  return MEMCACHED_SUCCESS;
 }