Removed dead param

diff --git a/libmemcached/hosts.cc b/libmemcached/hosts.cc
index dbfba007bd8d93c9c4d2e648e19e67da4ceab69b..2a07a395c24fe05f24f1ea2d93d880d4387d3747 100644 (file)
--- a/libmemcached/hosts.cc
+++ b/libmemcached/hosts.cc
@@ -62,10 +62,7 @@ static void sort_hosts(memcached_st *ptr)
 {
   if (memcached_server_count(ptr))
   {
-
     qsort(memcached_instance_list(ptr), memcached_server_count(ptr), sizeof(org::libmemcached::Instance), compare_servers);
-    org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, 0);
-    instance->number_of_hosts= memcached_server_count(ptr);
   }
 }
 
@@ -374,10 +371,6 @@ static memcached_return_t server_add(memcached_st *ptr,
 
   ptr->number_of_hosts++;
 
-  // @note we place the count in the bottom of the server list
-  instance= memcached_instance_fetch(ptr, 0);
-  memcached_instance_set_count(instance, memcached_server_count(ptr));
-
   return run_distribution(ptr);
 }
 
@@ -424,12 +417,6 @@ memcached_return_t memcached_server_push(memcached_st *ptr, const memcached_serv
     ptr->number_of_hosts++;
   }
 
-  // Provides backwards compatibility with server list.
-  {
-    org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, 0);
-    instance->number_of_hosts= memcached_server_count(ptr);
-  }
-
   return run_distribution(ptr);
 }
 
@@ -474,12 +461,6 @@ memcached_return_t memcached_instance_push(memcached_st *ptr, const struct org::
     ptr->number_of_hosts++;
   }
 
-  // Provides backwards compatibility with server list.
-  {
-    org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, 0);
-    instance->number_of_hosts= memcached_server_count(ptr);
-  }
-
   return run_distribution(ptr);
 }
 

diff --git a/libmemcached/instance.cc b/libmemcached/instance.cc
index 01c514f1f3155cd4f777f87e3bf23e4d11d96a18..aacdad64a3d2262f92a4e137a6c5250e32715c46 100644 (file)
--- a/libmemcached/instance.cc
+++ b/libmemcached/instance.cc
@@ -44,7 +44,6 @@ static inline void _server_init(org::libmemcached::Instance* self, memcached_st
 {
   self->options.is_shutting_down= false;
   self->options.is_dead= false;
-  self->number_of_hosts= 0;
   self->cursor_active_= 0;
   self->port_= port;
   self->fd= INVALID_SOCKET;
@@ -338,17 +337,6 @@ memcached_server_instance_st memcached_server_get_last_disconnect(const memcache
   return (memcached_server_instance_st)self->last_disconnected_server;
 }
 
-uint32_t memcached_instance_set_count(org::libmemcached::Instance* servers, uint32_t count)
-{
-  WATCHPOINT_ASSERT(servers);
-  if (servers == NULL)
-  {
-    return 0;
-  }
-
-  return servers->number_of_hosts= count;
-}
-
 const char *memcached_instance_name(const memcached_server_instance_st self)
 {
   WATCHPOINT_ASSERT(self);

diff --git a/libmemcached/instance.h b/libmemcached/instance.h
index c7539d80906a21c2a4217e9b6c71ccf169498c4f..6a56aa4c7b20f22b0f97238d6eab299e8ea48802 100644 (file)
--- a/libmemcached/instance.h
+++ b/libmemcached/instance.h
@@ -95,7 +95,6 @@ struct Instance {
     bool is_shutting_down:1;
     bool is_dead:1;
   } options;
-  uint32_t number_of_hosts;
   uint32_t cursor_active_;
   in_port_t port_;
   memcached_socket_t fd;

diff --git a/libmemcached/instance.hpp b/libmemcached/instance.hpp
index a69b8ea37985ad5724c0c447546fd8d5bc361ebb..1c614ab1f30db75f4855f517ee23a670c98d9ea8 100644 (file)
--- a/libmemcached/instance.hpp
+++ b/libmemcached/instance.hpp
@@ -57,6 +57,4 @@ uint32_t memcached_instance_count(const memcached_st* self);
 
 uint32_t memcached_instance_response_count(const org::libmemcached::Instance* self);
 
-uint32_t memcached_instance_set_count(org::libmemcached::Instance *servers, uint32_t count);
-
 void __instance_free(org::libmemcached::Instance *);