X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver_list.cc;h=8205edc90cf21a2179e0d9528f571c9f5b876774;hb=aacf5ba18fa98145d95f7a0567f0b32306fac1aa;hp=d2a00922594e9c13fe555d811a838caec37d6244;hpb=ca663a567bc8d3facb22b035bcad19349e42a9b1;p=awesomized%2Flibmemcached

diff --git a/libmemcached/server_list.cc b/libmemcached/server_list.cc
index d2a00922..8205edc9 100644
--- a/libmemcached/server_list.cc
+++ b/libmemcached/server_list.cc
@@ -89,6 +89,7 @@ memcached_server_list_append_with_weight(memcached_server_list_st ptr,
 #if 0
     *error= memcached_set_errno(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
 #endif
+    free(new_host_list);
     return NULL;
   }
 
@@ -126,26 +127,9 @@ uint32_t memcached_instance_list_count(const memcached_st* self)
     : self->number_of_hosts;
 }
 
-uint32_t memcached_instance_count(const memcached_instance_st* self)
+void memcached_instance_set(memcached_st* memc, org::libmemcached::Instance* list)
 {
-  return (self == NULL)
-    ? 0
-    : self->number_of_hosts;
-}
-
-memcached_instance_st *memcached_instance_list(const memcached_st *self)
-{
-  if (self)
-  {
-    return self->servers;
-  }
-
-  return NULL;
-}
-
-void memcached_instance_set(memcached_st *self, memcached_instance_st *list)
-{
-  self->servers= list;
+  memc->servers= list;
 }
 
 void memcached_server_list_free(memcached_server_list_st self)
@@ -164,7 +148,7 @@ void memcached_server_list_free(memcached_server_list_st self)
   libmemcached_free(self->root, self);
 }
 
-void memcached_instance_list_free(memcached_instance_st* self, uint32_t instance_count)
+void memcached_instance_list_free(org::libmemcached::Instance* self, uint32_t instance_count)
 {
   if (self == NULL)
   {