X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Fmemcached_hosts.c;h=76fd5a014430ef5cd84291746dfab33d10e75bd9;hb=fed759289b7835fcf310cd0e940fed56962aa9ba;hp=87a8cbd3058dfd3937122ee6cfefab234322616d;hpb=8f4f53d570ffa167f08912242c1a41d6f314ac0b;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached_hosts.c b/libmemcached/memcached_hosts.c index 87a8cbd3..76fd5a01 100644 --- a/libmemcached/memcached_hosts.c +++ b/libmemcached/memcached_hosts.c @@ -51,7 +51,11 @@ static int compare_servers(const void *p1, const void *p2) void sort_hosts(memcached_st *ptr) { - qsort(ptr->hosts, ptr->number_of_hosts, sizeof(memcached_server_st), compare_servers); + 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, @@ -121,7 +125,7 @@ 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) + if (ptr->flags & MEM_USE_SORT_HOSTS) sort_hosts(ptr); rebalance_wheel(ptr); @@ -185,7 +189,7 @@ 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) + if (ptr->flags & MEM_USE_SORT_HOSTS) sort_hosts(ptr); ptr->hosts[0].count= ptr->number_of_hosts;