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

diff --git a/lib/memcached_flush.c b/lib/memcached_flush.c
index f7527a7c..33cc6eb6 100644
--- a/lib/memcached_flush.c
+++ b/lib/memcached_flush.c
@@ -1,4 +1,4 @@
-#include <memcached.h>
+#include "common.h"
 
 memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
 {
@@ -6,32 +6,26 @@ memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
   size_t send_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+  LIBMEMCACHED_MEMCACHED_FLUSH_START();
 
-  rc= memcached_connect(ptr);
-
-  if (rc != MEMCACHED_SUCCESS)
-    rc= MEMCACHED_SOME_ERRORS;
+  if (ptr->number_of_hosts == 0)
+    return MEMCACHED_NO_SERVERS;
 
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
     if (expiration)
       send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                            "flush_all %u\r\n", expiration);
+                            "flush_all %llu\r\n", (unsigned long long)expiration);
     else
       send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                             "flush_all\r\n");
-    if ((send(ptr->hosts[x].fd, buffer, send_length, 0) == -1))
-    {
-      fprintf(stderr, "failed flush_all TCP\n");
-
-      return MEMCACHED_WRITE_FAILURE;
-    }
 
-    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);
   }
 
-  return rc;
+  LIBMEMCACHED_MEMCACHED_FLUSH_END();
+  return MEMCACHED_SUCCESS;
 }