X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached.c;h=31c12ab3158bc52af7665376171816157f27e3c5;hb=7b30155c3b85ef95cd1841efb1b109aa918ed52b;hp=25a287ad2c8834cbfba220a5dcbb2e1d8b5a6a48;hpb=b1daf61bf1665041f30fff7c96d61de4658f8db3;p=awesomized%2Flibmemcached

diff --git a/lib/memcached.c b/lib/memcached.c
index 25a287ad..31c12ab3 100644
--- a/lib/memcached.c
+++ b/lib/memcached.c
@@ -6,7 +6,8 @@
 memcached_st *memcached_create(memcached_st *ptr)
 {
   memcached_result_st *result_ptr;
-  if (!ptr)
+
+  if (ptr == NULL)
   {
     ptr= (memcached_st *)malloc(sizeof(memcached_st));
 
@@ -32,11 +33,19 @@ void memcached_free(memcached_st *ptr)
 {
   /* If we have anything open, lets close it now */
   memcached_quit(ptr);
-  memcached_server_list_free(ptr->hosts);
+  server_list_free(ptr, ptr->hosts);
   memcached_result_free(&ptr->result);
 
+  if (ptr->on_cleanup)
+    ptr->on_cleanup(ptr);
+
   if (ptr->is_allocated == MEMCACHED_ALLOCATED)
-    free(ptr);
+  {
+    if (ptr->call_free)
+      ptr->call_free(ptr, ptr);
+    else
+      free(ptr);
+  }
   else
     ptr->is_allocated= MEMCACHED_USED;
 }
@@ -84,5 +93,14 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr)
   new_clone->hash= ptr->hash;
   new_clone->user_data= ptr->user_data;
 
+  new_clone->on_clone= ptr->on_clone;
+  new_clone->on_cleanup= ptr->on_cleanup;
+  new_clone->call_free= ptr->call_free;
+  new_clone->call_malloc= ptr->call_malloc;
+  new_clone->call_realloc= ptr->call_realloc;
+
+  if (ptr->on_clone)
+    ptr->on_clone(ptr, new_clone);
+
   return new_clone;
 }