self->distribution= MEMCACHED_DISTRIBUTION_MODULA;
- hashkit_st *hash_ptr;
- hash_ptr= hashkit_create(&self->hashkit);
- if (! hash_ptr)
+ if (not hashkit_create(&self->hashkit))
return false;
self->ketama.continuum= NULL;
self->user_data= NULL;
self->number_of_replicas= 0;
- hash_ptr= hashkit_create(&self->distribution_hashkit);
- if (! hash_ptr)
- return false;
self->allocators= memcached_allocators_return_default();
memcached_virtual_bucket_free(ptr);
- if (ptr->last_disconnected_server)
- memcached_server_free(ptr->last_disconnected_server);
+ memcached_server_free(ptr->last_disconnected_server);
if (ptr->on_cleanup)
ptr->on_cleanup(ptr);
- if (ptr->ketama.continuum)
- libmemcached_free(ptr, ptr->ketama.continuum);
+ libmemcached_free(ptr, ptr->ketama.continuum);
memcached_array_free(ptr->prefix_key);
ptr->prefix_key= NULL;
{
ptr= (memcached_st *)malloc(sizeof(memcached_st));
- if (! ptr)
+ if (not ptr)
{
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
}
memcached_st *memcached(const char *string, size_t length)
{
- if (! length || ! string)
- {
- errno= EINVAL;
- return NULL;
- }
-
memcached_st *self= memcached_create(NULL);
- if (! self)
+ if (not self)
{
errno= ENOMEM;
return NULL;
}
- memcached_return_t rc;
- rc= memcached_parse_configuration(self, string, length);
+ if (not length)
+ return self;
- if (rc == MEMCACHED_SUCCESS && memcached_parse_filename(self))
+ memcached_return_t rc= memcached_parse_configuration(self, string, length);
+
+ if (memcached_success(rc) and memcached_parse_filename(self))
{
rc= memcached_parse_configure_file(self, memcached_parse_filename(self), memcached_parse_filename_length(self));
}
- if (rc != MEMCACHED_SUCCESS)
+ if (memcached_failed(rc))
{
memcached_free(self);
errno= EINVAL;
return NULL;
}
- errno= 0;
-
return self;
}
return MEMCACHED_SUCCESS;
}
-void memcached_servers_reset(memcached_st *ptr)
+void memcached_servers_reset(memcached_st *self)
{
- if (! ptr)
+ if (not self)
return;
- memcached_server_list_free(memcached_server_list(ptr));
+ memcached_server_list_free(memcached_server_list(self));
- memcached_server_list_set(ptr, NULL);
- ptr->number_of_hosts= 0;
- if (ptr->last_disconnected_server)
- {
- memcached_server_free(ptr->last_disconnected_server);
- }
- ptr->last_disconnected_server= NULL;
- ptr->server_failure_limit= 0;
+ memcached_server_list_set(self, NULL);
+ self->number_of_hosts= 0;
+ memcached_server_free(self->last_disconnected_server);
+ self->last_disconnected_server= NULL;
+ self->server_failure_limit= 0;
}
-void memcached_reset_last_disconnected_server(memcached_st *ptr)
+void memcached_reset_last_disconnected_server(memcached_st *self)
{
- if (! ptr)
+ if (not self)
return;
- if (ptr->last_disconnected_server)
- {
- memcached_server_free(ptr->last_disconnected_server);
- ptr->last_disconnected_server= NULL;
- }
+ memcached_server_free(self->last_disconnected_server);
+ self->last_disconnected_server= NULL;
}
void memcached_free(memcached_st *ptr)
{
- if (! ptr)
+ if (not ptr)
return;
_free(ptr, true);
new_clone->retry_timeout= source->retry_timeout;
new_clone->distribution= source->distribution;
- hashkit_st *hash_ptr;
-
- hash_ptr= hashkit_clone(&new_clone->hashkit, &source->hashkit);
- if (! hash_ptr)
- {
- memcached_free(new_clone);
- return NULL;
- }
-
- hash_ptr= hashkit_clone(&new_clone->distribution_hashkit, &source->distribution_hashkit);
- if (! hash_ptr)
+ if (not hashkit_clone(&new_clone->hashkit, &source->hashkit))
{
memcached_free(new_clone);
return NULL;
new_clone->prefix_key= memcached_array_clone(new_clone, source->prefix_key);
+ new_clone->configure.filename= memcached_array_clone(new_clone, source->prefix_key);
#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
if (source->sasl.callbacks)