{
ptr= (memcached_st *)calloc(1, sizeof(memcached_st));
- if (!ptr)
+ if (! ptr)
+ {
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
+ }
- ptr->is_allocated= true;
+ ptr->options.is_allocated= true;
}
else
{
memset(ptr, 0, sizeof(memcached_st));
}
+ ptr->options.is_initialized= true;
+
memcached_set_memory_allocators(ptr, NULL, NULL, NULL, NULL);
result_ptr= memcached_result_create(ptr, &ptr->result);
ptr->io_msg_watermark= 500;
ptr->io_bytes_watermark= 65 * 1024;
+ WATCHPOINT_ASSERT_INITIALIZED(&ptr->result);
+ WATCHPOINT_ASSERT_INITIALIZED(&ptr->hashkit);
+
return ptr;
}
if (ptr->continuum)
ptr->call_free(ptr, ptr->continuum);
- if (ptr->is_allocated)
+ if (memcached_is_allocated(ptr))
+ {
ptr->call_free(ptr, ptr);
+ }
else
- memset(ptr, 0, sizeof(memcached_st));
+ {
+ ptr->options.is_initialized= false;
+ }
}
/*
*/
memcached_st *memcached_clone(memcached_st *clone, memcached_st *source)
{
- memcached_return rc= MEMCACHED_SUCCESS;
+ memcached_return_t rc= MEMCACHED_SUCCESS;
memcached_st *new_clone;
if (source == NULL)
return memcached_create(clone);
- if (clone && clone->is_allocated)
+ if (clone && memcached_is_allocated(clone))
{
return NULL;
}