Fix OSX/clang compiler warning.

[m6w6/libmemcached] / libmemcached / server.cc

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index a9d7c7284184ff3111a0c87b73d958486692b8f2..ba40a6ee3fc3c07b31f3896d60cb7b64170dd2ab 100644 (file)
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -40,7 +40,7 @@
 */
 #include <libmemcached/common.h>
 
-static inline void _server_init(memcached_server_st *self, memcached_st *root,
+static inline void _server_init(memcached_server_st *self, Memcached *root,
                                 const memcached_string_t& hostname,
                                 in_port_t port,
                                 uint32_t weight, memcached_connection_t type)
@@ -82,7 +82,7 @@ static inline void _server_init(memcached_server_st *self, memcached_st *root,
   self->hostname[hostname.size]= 0;
 }
 
-static memcached_server_st *_server_create(memcached_server_st *self, const memcached_st *memc)
+static memcached_server_st *_server_create(memcached_server_st *self, const Memcached *memc)
 {
   if (self == NULL)
   {
@@ -105,8 +105,8 @@ static memcached_server_st *_server_create(memcached_server_st *self, const memc
   return self;
 }
 
-memcached_server_st *__server_create_with(memcached_st *memc,
-                                          memcached_server_st* self,
+memcached_server_st *__server_create_with(Memcached *memc,
+                                          memcached_server_st* allocated_instance,
                                           const memcached_string_t& hostname,
                                           const in_port_t port,
                                           uint32_t weight, 
@@ -118,16 +118,16 @@ memcached_server_st *__server_create_with(memcached_st *memc,
     return NULL;
   }
 
-  self= _server_create(self, memc);
+  allocated_instance= _server_create(allocated_instance, memc);
 
-  if (self == NULL)
+  if (allocated_instance == NULL)
   {
     return NULL;
   }
 
-  _server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
+  _server_init(allocated_instance, const_cast<Memcached *>(memc), hostname, port, weight, type);
 
-  return self;
+  return allocated_instance;
 }
 
 void __server_free(memcached_server_st *self)
@@ -194,10 +194,12 @@ uint32_t memcached_server_count(const memcached_st *self)
 const char *memcached_server_name(const memcached_server_instance_st self)
 {
   WATCHPOINT_ASSERT(self);
-  if (self == NULL)
-    return NULL;
+  if (self)
+  {
+    return self->_hostname;
+  }
 
-  return self->hostname;
+  return NULL;
 }
 
 in_port_t memcached_server_port(const memcached_server_instance_st self)
@@ -208,7 +210,7 @@ in_port_t memcached_server_port(const memcached_server_instance_st self)
     return 0;
   }
 
-  return self->port;
+  return self->port();
 }
 
 uint32_t memcached_server_response_count(const memcached_server_instance_st self)
@@ -219,7 +221,7 @@ uint32_t memcached_server_response_count(const memcached_server_instance_st self
     return 0;
   }
 
-  return self->cursor_active;
+  return self->cursor_active_;
 }
 
 const char *memcached_server_type(const memcached_server_instance_st ptr)