Merge in dist fix from Monty

[m6w6/libmemcached] / libmemcached / server_list.c

diff --git a/libmemcached/server_list.c b/libmemcached/server_list.c
index f3750ea17bcb741ea150c3f76989c7e17d0a635e..c20f8dbf9b775679131a5db0c4473d44d5682462 100644 (file)
--- a/libmemcached/server_list.c
+++ b/libmemcached/server_list.c
@@ -12,13 +12,14 @@
 
 #include "common.h"
 
-memcached_server_st *memcached_server_list_append_with_weight(memcached_server_st *ptr,
-                                                              const char *hostname, in_port_t port,
-                                                              uint32_t weight,
-                                                              memcached_return_t *error)
+memcached_server_list_st 
+memcached_server_list_append_with_weight(memcached_server_list_st ptr,
+                                         const char *hostname, in_port_t port,
+                                         uint32_t weight,
+                                         memcached_return_t *error)
 {
-  unsigned int count;
-  memcached_server_instance_st *new_host_list;
+  uint32_t count;
+  memcached_server_list_st new_host_list;
 
   if (hostname == NULL || error == NULL)
     return NULL;
@@ -30,12 +31,13 @@ memcached_server_st *memcached_server_list_append_with_weight(memcached_server_s
   count= 1;
   if (ptr != NULL)
   {
-    count+= memcached_servers_count(ptr);
+    count+= memcached_server_list_count(ptr);
   }
 
-  new_host_list= (memcached_server_instance_st *)realloc(ptr, sizeof(memcached_server_instance_st) * count);
+  new_host_list= (memcached_server_write_instance_st)realloc(ptr, sizeof(memcached_server_st) * count);
   if (!new_host_list)
   {
+    ptr->cached_errno= errno;
     *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
     return NULL;
   }
@@ -50,9 +52,27 @@ memcached_server_st *memcached_server_list_append_with_weight(memcached_server_s
   return new_host_list;
 }
 
-memcached_server_st *memcached_server_list_append(memcached_server_st *ptr,
-                                                  const char *hostname, in_port_t port,
-                                                  memcached_return_t *error)
+memcached_server_list_st
+memcached_server_list_append(memcached_server_list_st ptr,
+                             const char *hostname, in_port_t port,
+                             memcached_return_t *error)
 {
   return memcached_server_list_append_with_weight(ptr, hostname, port, 0, error);
 }
+
+uint32_t memcached_server_list_count(const memcached_server_list_st self)
+{
+  return (self == NULL)
+    ? 0
+    : self->number_of_hosts;
+}
+
+memcached_server_st *memcached_server_list(const memcached_st *self)
+{
+  return self->servers;
+}
+
+void memcached_server_list_set(memcached_st *self, memcached_server_st *list)
+{
+  self->servers= list;
+}