Sensei reported a bug with assert.h being included multiple times. Occurs on

[awesomized/libmemcached] / libmemcached / memcached_hosts.c

diff --git a/libmemcached/memcached_hosts.c b/libmemcached/memcached_hosts.c
index d6832ef3d21e3a1dacba8286d0c3d9d7152214fc..76fd5a014430ef5cd84291746dfab33d10e75bd9 100644 (file)
--- a/libmemcached/memcached_hosts.c
+++ b/libmemcached/memcached_hosts.c
@@ -49,6 +49,15 @@ static int compare_servers(const void *p1, const void *p2)
   return return_value;
 }
 
+void sort_hosts(memcached_st *ptr)
+{
+  if (ptr->number_of_hosts)
+  {
+    qsort(ptr->hosts, ptr->number_of_hosts, sizeof(memcached_server_st), compare_servers);
+    ptr->hosts[0].count= ptr->number_of_hosts;
+  }
+}
+
 static void host_reset(memcached_st *ptr, memcached_server_st *host, 
                        char *hostname, unsigned int port,
                        memcached_connection type)
@@ -116,8 +125,8 @@ memcached_return memcached_server_push(memcached_st *ptr, memcached_server_st *l
   }
   ptr->hosts[0].count= ptr->number_of_hosts;
 
-  if (ptr->number_of_hosts > 1 && ptr->flags & MEM_USE_SORT_HOSTS)
-    qsort(ptr->hosts, ptr->number_of_hosts, sizeof(memcached_server_st), compare_servers);
+  if (ptr->flags & MEM_USE_SORT_HOSTS)
+    sort_hosts(ptr);
 
   rebalance_wheel(ptr);
 
@@ -180,8 +189,8 @@ static memcached_return server_add(memcached_st *ptr, char *hostname,
   host_reset(ptr, &ptr->hosts[ptr->number_of_hosts], hostname, port, type);
   ptr->number_of_hosts++;
 
-  if (ptr->number_of_hosts > 1 && ptr->flags & MEM_USE_SORT_HOSTS)
-    qsort(ptr->hosts, ptr->number_of_hosts, sizeof(memcached_server_st), compare_servers);
+  if (ptr->flags & MEM_USE_SORT_HOSTS)
+    sort_hosts(ptr);
 
   ptr->hosts[0].count= ptr->number_of_hosts;