X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.c;h=f3bc6998370346f3bbd13000b953c518345eaf30;hb=e7561db4b56f2e78948710a0f360f65f5703a8e6;hp=2cff36da2eedf007a0c3d163137a2cf169151b77;hpb=7c7750f02368b570353ea109f23a0ea26d226e02;p=awesomized%2Flibmemcached

diff --git a/libmemcached/server.c b/libmemcached/server.c
index 2cff36da..f3bc6998 100644
--- a/libmemcached/server.c
+++ b/libmemcached/server.c
@@ -1,5 +1,5 @@
 /* LibMemcached
- * Copyright (C) 2006-2009 Brian Aker 
+ * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
  * Use and distribution licensed under the BSD license.  See
@@ -18,7 +18,7 @@ memcached_server_st *memcached_server_create(memcached_st *memc, memcached_serve
 {
   if (ptr == NULL)
   {
-    ptr= (memcached_server_st *)calloc(1, sizeof(memcached_server_st));
+    ptr= (memcached_server_st *)memc->call_calloc(memc, 1, sizeof(memcached_server_st));
 
     if (!ptr)
       return NULL; /*  MEMCACHED_MEMORY_ALLOCATION_FAILURE */
@@ -94,9 +94,9 @@ memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcache
   if (ptr == NULL)
     return NULL;
 
-  rv = memcached_server_create_with(ptr->root, clone,
-                                    ptr->hostname, ptr->port, ptr->weight,
-                                    ptr->type);
+  rv= memcached_server_create_with(ptr->root, clone,
+                                   ptr->hostname, ptr->port, ptr->weight,
+                                   ptr->type);
   if (rv != NULL)
   {
     rv->cached_errno= ptr->cached_errno;
@@ -113,11 +113,11 @@ memcached_return_t memcached_server_cursor(memcached_st *ptr,
                                            void *context,
                                            uint32_t number_of_callbacks)
 {
-  unsigned int y;
+  uint32_t y;
 
-  for (y= 0; y < ptr->number_of_hosts; y++)
+  for (y= 0; y < memcached_server_count(ptr); y++)
   {
-    unsigned int x;
+    uint32_t x;
 
     for (x= 0; x < number_of_callbacks; x++)
     {
@@ -142,7 +142,7 @@ memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key
   unlikely (*error != MEMCACHED_SUCCESS)
     return NULL;
 
-  unlikely (ptr->number_of_hosts == 0)
+  unlikely (memcached_server_count(ptr) == 0)
   {
     *error= MEMCACHED_NO_SERVERS;
     return NULL;
@@ -162,10 +162,9 @@ memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key
 
 const char *memcached_server_error(memcached_server_st *ptr)
 {
-  if (ptr)
-    return ptr->cached_server_error;
-  else
-    return NULL;
+  return ptr 
+    ?  ptr->cached_server_error
+    : NULL;
 }
 
 void memcached_server_error_reset(memcached_server_st *ptr)
@@ -177,3 +176,15 @@ memcached_server_st *memcached_server_get_last_disconnect(memcached_st *ptr)
 {
   return ptr->last_disconnected_server;
 }
+
+uint32_t memcached_server_list_count(memcached_server_st *ptr)
+{
+  return (ptr == NULL)
+    ? 0
+    : memcached_servers_count(ptr);
+}
+
+void memcached_server_list_free(memcached_server_st *ptr)
+{
+  server_list_free(NULL, ptr);
+}