Merge Monty.

[awesomized/libmemcached] / libmemcached / memcached.c

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index 4e8ec062bcf4f979f92d7aa86404baa640240ee6..329e170dacc174679ad92e5b8dad0157d7a5ec92 100644 (file)
--- a/libmemcached/memcached.c
+++ b/libmemcached/memcached.c
@@ -5,26 +5,31 @@
 
 memcached_st *memcached_create(memcached_st *ptr)
 {
-  memcached_result_st *result_ptr;
-
   if (ptr == NULL)
   {
     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);
-  WATCHPOINT_ASSERT(result_ptr);
+  if (! memcached_result_create(ptr, &ptr->result))
+  {
+    memcached_free(ptr);
+    return NULL;
+  }
   ptr->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
   ptr->connect_timeout= MEMCACHED_DEFAULT_TIMEOUT;
   ptr->retry_timeout= 0;
@@ -34,6 +39,8 @@ memcached_st *memcached_create(memcached_st *ptr)
   ptr->io_msg_watermark= 500;
   ptr->io_bytes_watermark= 65 * 1024;
 
+  WATCHPOINT_ASSERT_INITIALIZED(&ptr->result);
+
   return ptr;
 }
 
@@ -50,10 +57,14 @@ void memcached_free(memcached_st *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;
+  }
 }
 
 /*
@@ -63,13 +74,13 @@ void memcached_free(memcached_st *ptr)
 */
 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;
   }
@@ -87,7 +98,7 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *source)
   new_clone->retry_timeout= source->retry_timeout;
   new_clone->distribution= source->distribution;
   new_clone->hash= source->hash;
-  new_clone->hash_continuum= source->hash_continuum;
+  new_clone->distribution_hash= source->distribution_hash;
   new_clone->user_data= source->user_data;
 
   new_clone->snd_timeout= source->snd_timeout;
@@ -125,6 +136,7 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *source)
   }
 
   rc= run_distribution(new_clone);
+
   if (rc != MEMCACHED_SUCCESS)
   {
     memcached_free(new_clone);
@@ -137,6 +149,7 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *source)
 
   return new_clone;
 }
+
 void *memcached_get_user_data(memcached_st *ptr)
 {
   return ptr->user_data;
@@ -146,5 +159,6 @@ void *memcached_set_user_data(memcached_st *ptr, void *data)
 {
   void *ret= ptr->user_data;
   ptr->user_data= data;
+
   return ret;
 }