X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmemcached_flush.c;h=af2303ca6d41a3657ad5a0ad3c4bbe5a8f753953;hb=8d0cd77fc7bafd1f353bc7c50910b751766f931a;hp=a3e1be0b191250810f906b83411a1b77c8ebb941;hpb=ca065f55235fd9979ede818963780f417d70c64e;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_flush.c b/lib/memcached_flush.c
index a3e1be0b..af2303ca 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,8 +6,12 @@ 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);
+  rc= memcached_connect(ptr, 0);
+
+  if (rc == MEMCACHED_NO_SERVERS)
+    return rc;
 
   if (rc != MEMCACHED_SUCCESS)
     rc= MEMCACHED_SOME_ERRORS;
@@ -16,16 +20,17 @@ memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
   {
     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 ((write(ptr->hosts[x].fd, buffer, send_length) == -1))
-    {
-      fprintf(stderr, "failed flush_all TCP\n");
 
+    if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
       return MEMCACHED_WRITE_FAILURE;
-    }
+
+    rc= memcached_do(ptr, x, buffer, send_length, 1);
+    if (rc != MEMCACHED_SUCCESS)
+      goto error;
 
     rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x);
 
@@ -33,5 +38,7 @@ memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
       rc= MEMCACHED_SOME_ERRORS;
   }
 
+error:
+  LIBMEMCACHED_MEMCACHED_FLUSH_END();
   return rc;
 }