projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix for non-Linux platforms.
[m6w6/libmemcached]
/
libmemcached
/
server.c
diff --git
a/libmemcached/server.c
b/libmemcached/server.c
index 68e1ebaa4faf58118eea118dd2938dbfc343802f..f480750d8679079c5003ce4448c834777da91c6d 100644
(file)
--- a/
libmemcached/server.c
+++ b/
libmemcached/server.c
@@
-19,6
+19,7
@@
static inline void _server_init(memcached_server_st *self, const memcached_st *r
uint32_t weight, memcached_connection_t type)
{
self->options.sockaddr_inited= false;
uint32_t weight, memcached_connection_t type)
{
self->options.sockaddr_inited= false;
+ self->options.is_shutting_down= false;
self->number_of_hosts= 0;
self->cursor_active= 0;
self->port= port;
self->number_of_hosts= 0;
self->cursor_active= 0;
self->port= port;
@@
-53,7
+54,7
@@
static inline void _server_init(memcached_server_st *self, const memcached_st *r
if (hostname == NULL)
self->hostname[0]= 0;
else
if (hostname == NULL)
self->hostname[0]= 0;
else
- strncpy(self->hostname, hostname,
MEMCACHED_MAX_HOST_LENGTH
- 1);
+ strncpy(self->hostname, hostname,
NI_MAXHOST
- 1);
}
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_st *memc)
@@
-100,7
+101,7
@@
memcached_server_st *memcached_server_create_with(const memcached_st *memc, memc
void memcached_server_free(memcached_server_st *self)
{
void memcached_server_free(memcached_server_st *self)
{
- memcached_quit_server(self,
0
);
+ memcached_quit_server(self,
false
);
if (self->cached_server_error)
free(self->cached_server_error);
if (self->cached_server_error)
free(self->cached_server_error);
@@
-244,7
+245,7
@@
memcached_return_t memcached_server_remove(memcached_server_st *st_ptr)
for (x= 0, host_index= 0; x < memcached_server_count(root); x++)
{
for (x= 0, host_index= 0; x < memcached_server_count(root); x++)
{
- if (strncmp(list[x].hostname, st_ptr->hostname,
MEMCACHED_MAX_HOST_LENGTH
) != 0 || list[x].port != st_ptr->port)
+ if (strncmp(list[x].hostname, st_ptr->hostname,
NI_MAXHOST
) != 0 || list[x].port != st_ptr->port)
{
if (host_index != x)
memcpy(list+host_index, list+x, sizeof(memcached_server_st));
{
if (host_index != x)
memcpy(list+host_index, list+x, sizeof(memcached_server_st));