return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
memset(ptr, 0, sizeof(memcached_st));
- ptr->is_allocated= MEMCACHED_ALLOCATED;
+ ptr->is_allocated= true;
}
else
{
free(ptr->continuum);
}
- if (ptr->is_allocated == MEMCACHED_ALLOCATED)
+ if (ptr->is_allocated)
{
if (ptr->call_free)
ptr->call_free(ptr, ptr);
free(ptr);
}
else
- ptr->is_allocated= MEMCACHED_USED;
+ memset(ptr, 0, sizeof(memcached_st));
}
/*
if (source == NULL)
return memcached_create(clone);
- if (clone && clone->is_allocated == MEMCACHED_USED)
+ if (clone && clone->is_allocated)
{
return NULL;
}
-
- new_clone= memcached_create(clone);
-
- if (new_clone == NULL)
- return NULL;
-
- if (source->hosts)
- rc= memcached_server_push(new_clone, source->hosts);
- if (rc != MEMCACHED_SUCCESS)
- {
- memcached_free(new_clone);
+ new_clone= memcached_create(clone);
+ if (new_clone == NULL)
return NULL;
- }
-
new_clone->flags= source->flags;
new_clone->send_size= source->send_size;
new_clone->call_realloc= source->call_realloc;
new_clone->get_key_failure= source->get_key_failure;
new_clone->delete_trigger= source->delete_trigger;
+ new_clone->server_failure_limit= source->server_failure_limit;
+ new_clone->io_msg_watermark= source->io_msg_watermark;
+ new_clone->io_bytes_watermark= source->io_bytes_watermark;
+ new_clone->io_key_prefetch= source->io_key_prefetch;
+
+ if (source->hosts)
+ rc= memcached_server_push(new_clone, source->hosts);
+
+ if (rc != MEMCACHED_SUCCESS)
+ {
+ memcached_free(new_clone);
+
+ return NULL;
+ }
+
if (source->prefix_key[0] != 0)
{