X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver_list.cc;h=8205edc90cf21a2179e0d9528f571c9f5b876774;hb=9e4ae978d7d40c4f1c7d221c61a07a31a5e270d5;hp=d5994e852560b03bb165e527bef9455dc4c4ffee;hpb=f0ec3e2ffaf483bbd1329e8c6aba37f729e6df4f;p=m6w6%2Flibmemcached

diff --git a/libmemcached/server_list.cc b/libmemcached/server_list.cc
index d5994e85..8205edc9 100644
--- a/libmemcached/server_list.cc
+++ b/libmemcached/server_list.cc
@@ -46,7 +46,6 @@ memcached_server_list_append_with_weight(memcached_server_list_st ptr,
                                          memcached_return_t *error)
 {
   uint32_t count;
-  memcached_server_list_st new_host_list;
 
   memcached_return_t unused;
   if (error == NULL)
@@ -74,18 +73,23 @@ memcached_server_list_append_with_weight(memcached_server_list_st ptr,
     count+= memcached_server_list_count(ptr);
   }
 
-  new_host_list= (memcached_server_write_instance_st)realloc(ptr, sizeof(memcached_server_st) * count);
-  if (not new_host_list)
+  memcached_server_list_st new_host_list= (memcached_server_st*)realloc(ptr, sizeof(memcached_server_st) * count);
+  if (new_host_list == NULL)
   {
+#if 0
     *error= memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
+#endif
     return NULL;
   }
 
   memcached_string_t _hostname= { memcached_string_make_from_cstr(hostname) };
   /* @todo Check return type */
-  if (not __server_create_with(NULL, &new_host_list[count-1], _hostname, port, weight, port ? MEMCACHED_CONNECTION_TCP : MEMCACHED_CONNECTION_UNIX_SOCKET))
+  if (__server_create_with(NULL, &new_host_list[count-1], _hostname, port, weight, port ? MEMCACHED_CONNECTION_TCP : MEMCACHED_CONNECTION_UNIX_SOCKET) == NULL)
   {
+#if 0
     *error= memcached_set_errno(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
+#endif
+    free(new_host_list);
     return NULL;
   }
 
@@ -116,25 +120,24 @@ uint32_t memcached_server_list_count(const memcached_server_list_st self)
     : self->number_of_hosts;
 }
 
-memcached_server_st *memcached_server_list(const memcached_st *self)
+uint32_t memcached_instance_list_count(const memcached_st* self)
 {
-  if (self)
-  {
-    return self->servers;
-  }
-
-  return NULL;
+  return (self == NULL)
+    ? 0
+    : self->number_of_hosts;
 }
 
-void memcached_server_list_set(memcached_st *self, memcached_server_st *list)
+void memcached_instance_set(memcached_st* memc, org::libmemcached::Instance* list)
 {
-  self->servers= list;
+  memc->servers= list;
 }
 
 void memcached_server_list_free(memcached_server_list_st self)
 {
-  if (not self)
+  if (self == NULL)
+  {
     return;
+  }
 
   for (uint32_t x= 0; x < memcached_server_list_count(self); x++)
   {
@@ -144,3 +147,19 @@ void memcached_server_list_free(memcached_server_list_st self)
 
   libmemcached_free(self->root, self);
 }
+
+void memcached_instance_list_free(org::libmemcached::Instance* self, uint32_t instance_count)
+{
+  if (self == NULL)
+  {
+    return;
+  }
+
+  for (uint32_t x= 0; x < instance_count; x++)
+  {
+    assert_msg(not memcached_is_allocated(&self[x]), "You have called memcached_server_list_free(), but you did not pass it a valid memcached_server_list_st");
+    __instance_free(&self[x]);
+  }
+
+  libmemcached_free(self->root, self);
+}