Simply free so that we can not have a bunch of if/else around using custom/not custom...

[m6w6/libmemcached] / libmemcached / server.cc

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index cb0f0c2f65bdaeeaf5436f460ef98c523499ac0c..72f1b822808fd810c76fb8a4b14001926ef0235b 100644 (file)
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -146,14 +146,7 @@ void memcached_server_free(memcached_server_st *self)
 
   if (memcached_is_allocated(self))
   {
-    if (self->root)
-    {
-      libmemcached_free(self->root, self);
-    }
-    else
-    {
-      free(self);
-    }
+    libmemcached_free(self->root, self);
   }
   else
   {
@@ -300,14 +293,7 @@ void memcached_server_list_free(memcached_server_list_st self)
   }
 
   memcached_st *root= self->root;
-  if (root)
-  {
-    libmemcached_free(root, self);
-  }
-  else
-  {
-    free(self);
-  }
+  libmemcached_free(root, self);
 }
 
 uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)