Merge in simple extrace for strings, style issues in io

[awesomized/libmemcached] / libmemcached / server.cc

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index 4187a0ab4752451b362d2385f8471d33a7dbfe00..bde53c7e4c68954f3bd6081d81a8ebdeb1ece3f9 100644 (file)
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -119,7 +119,9 @@ memcached_server_st *__server_create_with(const memcached_st *memc,
   self= _server_create(self, memc);
 
   if (not self)
+  {
     return NULL;
+  }
 
   _server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
 
@@ -140,6 +142,7 @@ void __server_free(memcached_server_st *self)
   if (self->address_info)
   {
     freeaddrinfo(self->address_info);
+    self->address_info= NULL;
   }
 
   memcached_error_free(*self);
@@ -236,7 +239,9 @@ memcached_return_t memcached_server_execute(memcached_st *ptr,
     unsigned int iferror= (*callback)(ptr, instance, context);
 
     if (iferror)
+    {
       continue;
+    }
   }
 
   return MEMCACHED_SUCCESS;
@@ -280,7 +285,9 @@ void memcached_server_error_reset(memcached_server_st *self)
 {
   WATCHPOINT_ASSERT(self);
   if (not self)
+  {
     return;
+  }
 
   memcached_error_free(*self);
 }