Updated release notes

[awesomized/libmemcached] / libmemcached / memcached.c

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index 1144115f6a6e3d9cde4525a7a1742bde33f27b1c..a93bef7d651512ac7d49c4cf92e260fb200fb866 100644 (file)
--- a/libmemcached/memcached.c
+++ b/libmemcached/memcached.c
@@ -9,12 +9,11 @@ memcached_st *memcached_create(memcached_st *ptr)
 
   if (ptr == NULL)
   {
-    ptr= (memcached_st *)malloc(sizeof(memcached_st));
+    ptr= (memcached_st *)calloc(1, sizeof(memcached_st));
 
     if (!ptr)
       return NULL; /*  MEMCACHED_MEMORY_ALLOCATION_FAILURE */
 
-    memset(ptr, 0, sizeof(memcached_st));
     ptr->is_allocated= true;
   }
   else
@@ -81,22 +80,11 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *source)
   {
     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;
@@ -119,6 +107,21 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *source)
   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)
   {