X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_server.c;h=04364f3a3d31bad4b0c5fe607c353c8acb980c55;hb=67f0779a5c91cde63c1da8240a9f4d95509d3273;hp=4aebfd3b7367506dfb030cb64794226fd56d2b29;hpb=97fa086c7ea61d12f86581325c22e69426dd25a2;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached_server.c b/libmemcached/memcached_server.c
index 4aebfd3b..04364f3a 100644
--- a/libmemcached/memcached_server.c
+++ b/libmemcached/memcached_server.c
@@ -7,12 +7,11 @@ memcached_server_st *memcached_server_create(memcached_st *memc, memcached_serve
 {
   if (ptr == NULL)
   {
-    ptr= (memcached_server_st *)malloc(sizeof(memcached_server_st));
+    ptr= (memcached_server_st *)calloc(1, sizeof(memcached_server_st));
 
     if (!ptr)
       return NULL; /*  MEMCACHED_MEMORY_ALLOCATION_FAILURE */
 
-    memset(ptr, 0, sizeof(memcached_server_st));
     ptr->is_allocated= true;
   }
   else
@@ -61,12 +60,7 @@ void memcached_server_free(memcached_server_st *ptr)
   }
 
   if (ptr->is_allocated)
-  {
-    if (ptr->root && ptr->root->call_free)
-      ptr->root->call_free(ptr->root, ptr);
-    else
-      free(ptr);
-  }
+    ptr->root->call_free(ptr->root, ptr);
   else
     memset(ptr, 0, sizeof(memcached_server_st));
 }