Remove how use instance (keep API intact)

[m6w6/libmemcached] / libmemcached / server_list.cc

diff --git a/libmemcached/server_list.cc b/libmemcached/server_list.cc
index 4da1996354daee6c8cd802d89e2acfc2b58cf485..d2a00922594e9c13fe555d811a838caec37d6244 100644 (file)
--- a/libmemcached/server_list.cc
+++ b/libmemcached/server_list.cc
@@ -38,7 +38,6 @@
 
 
 #include <libmemcached/common.h>
-#include <libmemcached/assert.hpp>
 
 memcached_server_list_st 
 memcached_server_list_append_with_weight(memcached_server_list_st ptr,
@@ -47,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)
@@ -67,6 +65,7 @@ memcached_server_list_append_with_weight(memcached_server_list_st ptr,
     port= MEMCACHED_DEFAULT_PORT;
   }
 
+
   /* Increment count for hosts */
   count= 1;
   if (ptr != NULL)
@@ -74,17 +73,22 @@ 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
     return NULL;
   }
 
@@ -115,20 +119,41 @@ 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)
+{
+  return (self == NULL)
+    ? 0
+    : self->number_of_hosts;
+}
+
+uint32_t memcached_instance_count(const memcached_instance_st* self)
+{
+  return (self == NULL)
+    ? 0
+    : self->number_of_hosts;
+}
+
+memcached_instance_st *memcached_instance_list(const memcached_st *self)
 {
-  return self->servers;
+  if (self)
+  {
+    return self->servers;
+  }
+
+  return NULL;
 }
 
-void memcached_server_list_set(memcached_st *self, memcached_server_st *list)
+void memcached_instance_set(memcached_st *self, memcached_instance_st *list)
 {
   self->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++)
   {
@@ -138,3 +163,19 @@ 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)
+{
+  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);
+}