Merge up for version.

[m6w6/libmemcached] / libmemcached / server.cc

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index f5fe62e19bf3729fe867c1542c29bc286196ee45..eda7f847a9c648375c3359b93c6d2a3ca9e2f9f9 100644 (file)
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -39,7 +39,6 @@
   This is a partial implementation for fetching/creating memcached_server_st objects.
 */
 #include <libmemcached/common.h>
-#include <cassert>
 
 static inline void _server_init(memcached_server_st *self, memcached_st *root,
                                 const char *hostname, in_port_t port,
@@ -141,6 +140,7 @@ void __server_free(memcached_server_st *self)
   if (self->address_info)
   {
     freeaddrinfo(self->address_info);
+    self->address_info= NULL;
   }
 
   memcached_error_free(*self);
@@ -313,7 +313,7 @@ uint32_t memcached_server_count(const memcached_st *self)
   return self->number_of_hosts;
 }
 
-const char *memcached_server_name(memcached_server_instance_st self)
+const char *memcached_server_name(const memcached_server_instance_st self)
 {
   WATCHPOINT_ASSERT(self);
   if (not self)
@@ -322,7 +322,7 @@ const char *memcached_server_name(memcached_server_instance_st self)
   return self->hostname;
 }
 
-in_port_t memcached_server_port(memcached_server_instance_st self)
+in_port_t memcached_server_port(const memcached_server_instance_st self)
 {
   WATCHPOINT_ASSERT(self);
   if (not self)
@@ -331,7 +331,7 @@ in_port_t memcached_server_port(memcached_server_instance_st self)
   return self->port;
 }
 
-uint32_t memcached_server_response_count(memcached_server_instance_st self)
+uint32_t memcached_server_response_count(const memcached_server_instance_st self)
 {
   WATCHPOINT_ASSERT(self);
   if (not self)
@@ -340,7 +340,7 @@ uint32_t memcached_server_response_count(memcached_server_instance_st self)
   return self->cursor_active;
 }
 
-const char *memcached_server_type(memcached_server_instance_st ptr)
+const char *memcached_server_type(const memcached_server_instance_st ptr)
 {
   if (ptr)
   {