X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_flush.c;h=af2303ca6d41a3657ad5a0ad3c4bbe5a8f753953;hb=8d0cd77fc7bafd1f353bc7c50910b751766f931a;hp=58f5bff2d8919be99c7d7a09e738f984f109bf02;hpb=131622cdc2710ecd9ad554ce7d08c6003fbdcf6e;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_flush.c b/lib/memcached_flush.c
index 58f5bff2..af2303ca 100644
--- a/lib/memcached_flush.c
+++ b/lib/memcached_flush.c
@@ -3,7 +3,7 @@
 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();
@@ -16,7 +16,6 @@ memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
   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)
@@ -29,10 +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= memcached_io_write(ptr, x, buffer, send_length, 1);
-
-    if (sent_length == -1 || 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);
 
@@ -40,6 +38,7 @@ memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
       rc= MEMCACHED_SOME_ERRORS;
   }
 
+error:
   LIBMEMCACHED_MEMCACHED_FLUSH_END();
   return rc;
 }