Clean up the ASCII parser.

[awesomized/libmemcached] / libmemcached / server.cc

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index ed360ee31aaa2f14f560df9e5e92059dcc6562a1..7011fd240c68843a93667af8dbfa2d3d6135550c 100644 (file)
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -90,7 +90,7 @@ static memcached_server_st *_server_create(memcached_server_st *self, const memc
 {
   if (not self)
   {
-   self= (memcached_server_st *)libmemcached_malloc(memc, sizeof(memcached_server_st));
+   self= libmemcached_xmalloc(memc, struct memcached_server_st);
 
     if (not self)
     {
@@ -124,7 +124,7 @@ memcached_server_st *__server_create_with(memcached_st *memc,
 
   self= _server_create(self, memc);
 
-  if (not self)
+  if (self == NULL)
   {
     return NULL;
   }
@@ -132,12 +132,17 @@ memcached_server_st *__server_create_with(memcached_st *memc,
   _server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
 
 
-  if (type == MEMCACHED_CONNECTION_UDP)
+  if (memc and memcached_is_udp(memc))
   {
     self->write_buffer_offset= UDP_DATAGRAM_HEADER_LENGTH;
     memcached_io_init_udp_header(self, 0);
   }
 
+  if (memc)
+  {
+    set_hostinfo(self);
+  }
+
   return self;
 }
 
@@ -166,8 +171,10 @@ void __server_free(memcached_server_st *self)
 
 void memcached_server_free(memcached_server_st *self)
 {
-  if (not self)
+  if (self == NULL)
+  {
     return;
+  }
 
   if (memcached_server_list_count(self))
   {
@@ -185,7 +192,7 @@ memcached_server_st *memcached_server_clone(memcached_server_st *destination,
                                             memcached_server_st *source)
 {
   /* We just do a normal create if source is missing */
-  if (not source)
+  if (source == NULL)
   {
     return NULL;
   }
@@ -195,14 +202,6 @@ memcached_server_st *memcached_server_clone(memcached_server_st *destination,
                                     hostname,
                                     source->port, source->weight,
                                     source->type);
-  if (not destination)
-  {
-    if (source->error_messages)
-    {
-      destination->error_messages= memcached_error_copy(*source);
-    }
-  }
-
   return destination;
 
 }
@@ -258,17 +257,19 @@ memcached_return_t memcached_server_execute(memcached_st *ptr,
   return MEMCACHED_SUCCESS;
 }
 
-memcached_server_instance_st memcached_server_by_key(const memcached_st *ptr,
+memcached_server_instance_st memcached_server_by_key(memcached_st *ptr,
                                                      const char *key,
                                                      size_t key_length,
                                                      memcached_return_t *error)
 {
-  memcached_return_t rc;
   memcached_return_t unused;
-
   if (not error)
+  {
     error= &unused;
+  }
 
+
+  memcached_return_t rc;
   if (memcached_failed(rc= initialize_const_query(ptr)))
   {
     *error= rc;