Update libtest

[m6w6/libmemcached] / libmemcached / error.cc

diff --git a/libmemcached/error.cc b/libmemcached/error.cc
index bc931de65cafe39b807338ca3bbce749bbf65edc..62616b3099dab8ac63dc3331c873dffcebd1d7d7 100644 (file)
--- a/libmemcached/error.cc
+++ b/libmemcached/error.cc
@@ -281,7 +281,7 @@ memcached_return_t memcached_set_error(memcached_instance_st& self, memcached_re
 
   size+= append_host_to_string(self, hostname_port_message_ptr, sizeof(hostname_port_message) -size);
 
-  memcached_string_t error_host= { hostname_port_message, size };
+  memcached_string_t error_host= { hostname_port_message, size_t(size) };
 
   assert(self.root);
   if (self.root == NULL)
@@ -464,19 +464,10 @@ void memcached_error_print(const memcached_st *self)
 
 static void _error_free(memcached_error_t *error)
 {
-  if (not error)
+  if (error)
   {
-    return;
-  }
-
-  _error_free(error->next);
+    _error_free(error->next);
 
-  if (error and error->root)
-  {
-    libmemcached_free(error->root, error);
-  }
-  else if (error)
-  {
     libmemcached_free(error->root, error);
   }
 }