X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fhosts.c;h=7778735c9697b12a2e0410a811e1add3c5b1eb34;hb=addf09c6f6cf93f980f3de9cf649258c965b2934;hp=e3e9e9c67783caec32fefa8adf6bff46d730ac4d;hpb=14fbb41f4a761f96a047c36f9eaae33e6b57d21f;p=m6w6%2Flibmemcached

diff --git a/libmemcached/hosts.c b/libmemcached/hosts.c
index e3e9e9c6..7778735c 100644
--- a/libmemcached/hosts.c
+++ b/libmemcached/hosts.c
@@ -299,7 +299,7 @@ memcached_return_t memcached_server_push(memcached_st *ptr, memcached_server_st
 {
   uint32_t x;
   uint32_t count;
-  memcached_server_instance_st *new_host_list;
+  memcached_server_st *new_host_list;
 
   if (! list)
     return MEMCACHED_SUCCESS;
@@ -326,7 +326,6 @@ memcached_return_t memcached_server_push(memcached_st *ptr, memcached_server_st
 
     instance= memcached_server_instance_fetch(ptr, memcached_server_count(ptr));
 
-    memcached_server_create(ptr, instance);
     /* TODO check return type */
     (void)memcached_server_create_with(ptr, instance, list[x].hostname,
                                        list[x].port, list[x].weight, list[x].type);
@@ -432,13 +431,21 @@ static memcached_return_t server_add(memcached_st *ptr, const char *hostname,
   return run_distribution(ptr);
 }
 
+/**
+  @todo allow lists to query themselves even if they lack a root
+*/
 memcached_return_t memcached_server_remove(memcached_server_st *st_ptr)
 {
   uint32_t x, host_index;
-  memcached_st *ptr= st_ptr->root;
-  memcached_server_st *list= memcached_server_list(ptr);
+  memcached_st *root= (memcached_st *)st_ptr->root;
+  memcached_server_st *list;
+
+  if (root == NULL)
+    return MEMCACHED_FAILURE;
+
+  list= memcached_server_list(root);
 
-  for (x= 0, host_index= 0; x < memcached_server_count(ptr); x++)
+  for (x= 0, host_index= 0; x < memcached_server_count(root); x++)
   {
     if (strncmp(list[x].hostname, st_ptr->hostname, MEMCACHED_MAX_HOST_LENGTH) != 0 || list[x].port != st_ptr->port)
     {
@@ -447,14 +454,14 @@ memcached_return_t memcached_server_remove(memcached_server_st *st_ptr)
       host_index++;
     }
   }
-  ptr->number_of_hosts= host_index;
+  root->number_of_hosts= host_index;
 
   if (st_ptr->address_info)
   {
     freeaddrinfo(st_ptr->address_info);
     st_ptr->address_info= NULL;
   }
-  run_distribution(ptr);
+  run_distribution(root);
 
   return MEMCACHED_SUCCESS;
 }