Added tag 0.2 for changeset 72b98d8bc30e

[awesomized/libmemcached] / lib / memcached_flush.c

diff --git a/lib/memcached_flush.c b/lib/memcached_flush.c
index 07fc3ac0b63ce712e740ace8ffc819e887431e26..a822f4ad64d05b07eb5b881c2c68f1112df59455 100644 (file)
--- a/lib/memcached_flush.c
+++ b/lib/memcached_flush.c
@@ -12,6 +12,7 @@ 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)
@@ -26,18 +27,8 @@ memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
 
     sent_length= write(ptr->hosts[x].fd, buffer, send_length);
 
-    if (sent_length == -1)
-    {
-      fprintf(stderr, "error %s: write: %m\n", __FUNCTION__);
+    if (sent_length == -1 || sent_length != send_length)
       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_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x);