Trying to remove branch

[m6w6/libmemcached] / lib / memcached_flush.c

diff --git a/lib/memcached_flush.c b/lib/memcached_flush.c
index 33cc6eb65ce378ebba3e32d8178c751cb70ce4ce..1511adbe43ce0913f09cd1c9ee335e280e4b4db9 100644 (file)
--- a/lib/memcached_flush.c
+++ b/lib/memcached_flush.c
@@ -8,7 +8,7 @@ memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   LIBMEMCACHED_MEMCACHED_FLUSH_START();
 
-  if (ptr->number_of_hosts == 0)
+  unlikely (ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
 
   for (x= 0; x < ptr->number_of_hosts; x++)
@@ -20,10 +20,10 @@ memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
       send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                             "flush_all\r\n");
 
-    rc= memcached_do(ptr, x, buffer, send_length, 1);
+    rc= memcached_do(&ptr->hosts[x], buffer, send_length, 1);
 
     if (rc == MEMCACHED_SUCCESS)
-      (void)memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL, x);
+      (void)memcached_response(&ptr->hosts[x], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
   }
 
   LIBMEMCACHED_MEMCACHED_FLUSH_END();