Merge in trunk.

[awesomized/libmemcached] / libmemcached / server.cc

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index 30cc611fcb39dbc648be7af0cb74a2ba60d5e27e..57540ccff06d150f9db5c1ed5e997ffe086a7783 100644 (file)
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -41,7 +41,7 @@
 #include <libmemcached/common.h>
 #include <cassert>
 
-static inline void _server_init(memcached_server_st *self, const memcached_st *root,
+static inline void _server_init(memcached_server_st *self, memcached_st *root,
                                 const char *hostname, in_port_t port,
                                 uint32_t weight, memcached_connection_t type)
 {
@@ -92,11 +92,11 @@ static inline void _server_init(memcached_server_st *self, const memcached_st *r
 
 static memcached_server_st *_server_create(memcached_server_st *self, const memcached_st *memc)
 {
-  if (self == NULL)
+  if (not self)
   {
    self= (memcached_server_st *)libmemcached_malloc(memc, sizeof(memcached_server_st));
 
-    if (! self)
+    if (not self)
       return NULL; /*  MEMCACHED_MEMORY_ALLOCATION_FAILURE */
 
     self->options.is_allocated= true;
@@ -118,10 +118,10 @@ memcached_server_st *memcached_server_create_with(const memcached_st *memc,
 {
   self= _server_create(self, memc);
 
-  if (self == NULL)
+  if (not self)
     return NULL;
 
-  _server_init(self, memc, hostname, port, weight, type);
+  _server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
 
 
   if (type == MEMCACHED_CONNECTION_UDP)
@@ -135,7 +135,9 @@ memcached_server_st *memcached_server_create_with(const memcached_st *memc,
 
 void memcached_server_free(memcached_server_st *self)
 {
-  assert(self);
+  if (not self)
+    return;
+
   memcached_quit_server(self, false);
 
   if (self->cached_server_error)
@@ -146,14 +148,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
   {
@@ -174,7 +169,7 @@ memcached_server_st *memcached_server_clone(memcached_server_st *destination,
   destination= memcached_server_create_with(source->root, destination,
                                             source->hostname, source->port, source->weight,
                                             source->type);
-  if (destination != NULL)
+  if (not destination)
   {
     destination->cached_errno= source->cached_errno;
 
@@ -299,15 +294,8 @@ void memcached_server_list_free(memcached_server_list_st self)
     }
   }
 
-  const memcached_st *root= self->root;
-  if (root)
-  {
-    libmemcached_free(root, self);
-  }
-  else
-  {
-    free(self);
-  }
+  memcached_st *root= self->root;
+  libmemcached_free(root, self);
 }
 
 uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)