Merge Lee

[awesomized/libmemcached] / libmemcached / verbosity.c

diff --git a/libmemcached/verbosity.c b/libmemcached/verbosity.c
index 3d34880d9f52da24bff68d9d2bc81ee9c9c0599a..7c7b7ae190bd6d2531915580cf52a00c529d047e 100644 (file)
--- a/libmemcached/verbosity.c
+++ b/libmemcached/verbosity.c
@@ -1,8 +1,8 @@
 #include "common.h"
 
-memcached_return_t memcached_verbosity(memcached_st *ptr, unsigned int verbosity)
+memcached_return_t memcached_verbosity(memcached_st *ptr, uint32_t verbosity)
 {
-  unsigned int x;
+  uint32_t x;
   size_t send_length;
   memcached_return_t rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
@@ -13,11 +13,13 @@ memcached_return_t memcached_verbosity(memcached_st *ptr, unsigned int verbosity
     return MEMCACHED_WRITE_FAILURE;
 
   rc= MEMCACHED_SUCCESS;
-  for (x= 0; x < ptr->number_of_hosts; x++)
+  for (x= 0; x < memcached_server_count(ptr); x++)
   {
     memcached_return_t rrc;
+    memcached_server_instance_st *instance=
+      memcached_server_instance_fetch(ptr, x);
 
-    rrc= memcached_do(&ptr->hosts[x], buffer, send_length, 1);
+    rrc= memcached_do(instance, buffer, send_length, 1);
     if (rrc != MEMCACHED_SUCCESS)
     {
       rc= MEMCACHED_SOME_ERRORS;
@@ -27,7 +29,7 @@ memcached_return_t memcached_verbosity(memcached_st *ptr, unsigned int verbosity
     unlikely (ptr->flags.use_udp)
       continue;
 
-    rrc= memcached_response(&ptr->hosts[x], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+    rrc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
     if (rrc != MEMCACHED_SUCCESS)
       rc= MEMCACHED_SOME_ERRORS;
   }