X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fhosts.cc;h=ad01decd70faa1c4e494714db853cfb8011aac0d;hb=ac25aff8b62e8596e20f0fd2a2c3eda96bdb437e;hp=8f1215020214ea9f372952406f19157bce3d2ebf;hpb=f875d401486e0e12d30b28e9d62220fdf6cd8561;p=awesomized%2Flibmemcached diff --git a/src/libmemcached/hosts.cc b/src/libmemcached/hosts.cc index 8f121502..ad01decd 100644 --- a/src/libmemcached/hosts.cc +++ b/src/libmemcached/hosts.cc @@ -311,7 +311,7 @@ static memcached_return_t server_add(Memcached *memc, const memcached_string_t & memcached_instance_st *instance = memcached_instance_fetch(memc, memcached_server_count(memc) - 1); - if (__instance_create_with(memc, instance, hostname, port, weight, type) == NULL) { + if (instance_create_with(memc, instance, hostname, port, weight, type) == NULL) { return memcached_set_error(*memc, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT); } @@ -353,8 +353,7 @@ memcached_return_t memcached_server_push(memcached_st *shell, const memcached_se WATCHPOINT_ASSERT(instance); memcached_string_t hostname = {memcached_string_make_from_cstr(list[x].hostname)}; - if (__instance_create_with(ptr, instance, hostname, list[x].port, list[x].weight, - list[x].type) + if (instance_create_with(ptr, instance, hostname, list[x].port, list[x].weight, list[x].type) == NULL) { ptr->state.is_parsing = false; @@ -404,8 +403,7 @@ memcached_return_t memcached_instance_push(memcached_st *ptr, WATCHPOINT_ASSERT(instance); memcached_string_t hostname = {memcached_string_make_from_cstr(list[x]._hostname)}; - if (__instance_create_with(ptr, instance, hostname, list[x].port(), list[x].weight, - list[x].type) + if (instance_create_with(ptr, instance, hostname, list[x].port(), list[x].weight, list[x].type) == NULL) { ptr->state.is_parsing = false;