Merge in code changes for all of the new parser.

[m6w6/libmemcached] / libmemcached / flush_buffers.c

diff --git a/libmemcached/flush_buffers.c b/libmemcached/flush_buffers.c
index aeae5205dd9f82ea19b6dd1928ebdde0be88e1ee..649db983ec65295033058e81871126959bc53ac6 100644 (file)
--- a/libmemcached/flush_buffers.c
+++ b/libmemcached/flush_buffers.c
@@ -5,17 +5,25 @@ memcached_return_t memcached_flush_buffers(memcached_st *memc)
   memcached_return_t ret= MEMCACHED_SUCCESS;
 
   for (uint32_t x= 0; x < memcached_server_count(memc); ++x)
-    if (memc->hosts[x].write_buffer_offset != 0) 
+  {
+    memcached_server_write_instance_st instance=
+      memcached_server_instance_fetch(memc, x);
+
+    if (instance->write_buffer_offset != 0) 
     {
-      if (memc->hosts[x].fd == -1 &&
-          (ret= memcached_connect(&memc->hosts[x])) != MEMCACHED_SUCCESS)
+      if (instance->fd == -1 &&
+          (ret= memcached_connect(instance)) != MEMCACHED_SUCCESS)
       {
         WATCHPOINT_ERROR(ret);
         return ret;
       }
-      if (memcached_io_write(&memc->hosts[x], NULL, 0, 1) == -1)
+
+      if (memcached_io_write(instance, NULL, 0, true) == -1)
+      {
         ret= MEMCACHED_SOME_ERRORS;
+      }
     }
+  }
 
   return ret;
 }