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

diff --git a/lib/memcached_flush.c b/lib/memcached_flush.c
index 07fc3ac0..af2303ca 100644
--- a/lib/memcached_flush.c
+++ b/lib/memcached_flush.c
@@ -1,13 +1,17 @@
-#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);
+  rc= memcached_connect(ptr, 0);
+
+  if (rc == MEMCACHED_NO_SERVERS)
+    return rc;
 
   if (rc != MEMCACHED_SUCCESS)
     rc= MEMCACHED_SOME_ERRORS;
@@ -24,20 +28,9 @@ memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
     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)
-    {
-      fprintf(stderr, "error %s: write: %m\n", __FUNCTION__);
-      return MEMCACHED_WRITE_FAILURE;
-    }
-
-    if (sent_length != send_length)
-    {
-      fprintf(stderr, "error %s: short write %d %d: %m\n",
-	      __FUNCTION__, sent_length, send_length);
-      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);
 
@@ -45,5 +38,7 @@ memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
       rc= MEMCACHED_SOME_ERRORS;
   }
 
+error:
+  LIBMEMCACHED_MEMCACHED_FLUSH_END();
   return rc;
 }