Ignore reclaimed stat

[m6w6/libmemcached] / libmemcached / server.c

diff --git a/libmemcached/server.c b/libmemcached/server.c
index bcc211f655a4e9e88aa73aac4868970ab2c6ae1d..6fd685feac76dcece0dce6aaaa498f2fe094ef37 100644 (file)
--- a/libmemcached/server.c
+++ b/libmemcached/server.c
@@ -53,7 +53,7 @@ static inline void _server_init(memcached_server_st *self, const memcached_st *r
   if (hostname == NULL)
     self->hostname[0]= 0;
   else
-    strncpy(self->hostname, hostname, MEMCACHED_MAX_HOST_LENGTH - 1);
+    strncpy(self->hostname, hostname, NI_MAXHOST - 1);
 }
 
 static memcached_server_st *_server_create(memcached_server_st *self, const memcached_st *memc)
@@ -227,3 +227,38 @@ void memcached_server_list_free(memcached_server_st *ptr)
 {
   server_list_free(NULL, 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 *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(root); x++)
+  {
+    if (strncmp(list[x].hostname, st_ptr->hostname, NI_MAXHOST) != 0 || list[x].port != st_ptr->port)
+    {
+      if (host_index != x)
+        memcpy(list+host_index, list+x, sizeof(memcached_server_st));
+      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(root);
+
+  return MEMCACHED_SUCCESS;
+}