*/
#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)
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)
{
return self;
}
-memcached_server_st *__server_create_with(memcached_st *memc,
+memcached_server_st *__server_create_with(Memcached *memc,
memcached_server_st* allocated_instance,
const memcached_string_t& hostname,
const in_port_t port,
return NULL;
}
- _server_init(allocated_instance, const_cast<memcached_st *>(memc), hostname, port, weight, type);
+ _server_init(allocated_instance, const_cast<Memcached *>(memc), hostname, port, weight, type);
return allocated_instance;
}
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)
return 0;
}
- return self->cursor_active;
+ return self->cursor_active_;
}
const char *memcached_server_type(const memcached_server_instance_st ptr)