X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_connect.c;h=381053950b16540dbc5d05925ebcc87031d369ab;hb=257f0547823cf6b18473ba8bd2580b38235f6d79;hp=516b5db346482e24500854deef4fbc0c4267aef5;hpb=a95ca4ad9c0f9d23c8a83bd337acdecc221021ef;p=m6w6%2Flibmemcached diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c index 516b5db3..38105395 100644 --- a/lib/memcached_connect.c +++ b/lib/memcached_connect.c @@ -1,45 +1,5 @@ #include "common.h" -memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigned int port) -{ - memcached_server_st *new_host_list; - char *new_hostname; - LIBMEMCACHED_MEMCACHED_SERVER_ADD_START(); - - if (!port) - port= MEMCACHED_DEFAULT_PORT; - - if (!hostname) - hostname= "localhost"; - - - new_host_list= (memcached_server_st *)realloc(ptr->hosts, sizeof(memcached_server_st) * (ptr->number_of_hosts+1)); - if (!new_host_list) - return MEMCACHED_MEMORY_ALLOCATION_FAILURE; - memset(&new_host_list[ptr->number_of_hosts], 0, sizeof(memcached_server_st)); - - if (!new_host_list) - return MEMCACHED_MEMORY_ALLOCATION_FAILURE; - - ptr->hosts= new_host_list; - - new_hostname= - (char *)malloc(sizeof(char) * (strlen(hostname)+1)); - if (!new_hostname) - return MEMCACHED_MEMORY_ALLOCATION_FAILURE; - - memset(new_hostname, 0, strlen(hostname)+1); - memcpy(new_hostname, hostname, strlen(hostname)); - ptr->hosts[ptr->number_of_hosts].hostname= new_hostname; - ptr->hosts[ptr->number_of_hosts].port= port; - ptr->hosts[ptr->number_of_hosts].fd= -1; - ptr->number_of_hosts++; - - LIBMEMCACHED_MEMCACHED_SERVER_ADD_END(); - - return MEMCACHED_SUCCESS; -} - memcached_return memcached_connect(memcached_st *ptr) { unsigned int x; @@ -52,9 +12,7 @@ memcached_return memcached_connect(memcached_st *ptr) return MEMCACHED_SUCCESS; if (!ptr->hosts) - { return MEMCACHED_NO_SERVERS; - } for (x= 0; x < ptr->number_of_hosts; x++) {