projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Clean up the ASCII parser.
[awesomized/libmemcached]
/
libmemcached
/
server.cc
diff --git
a/libmemcached/server.cc
b/libmemcached/server.cc
index c9c5ffca6b3a9269ca3782d3f1e68fe3f4151375..7011fd240c68843a93667af8dbfa2d3d6135550c 100644
(file)
--- a/
libmemcached/server.cc
+++ b/
libmemcached/server.cc
@@
-90,7
+90,7
@@
static memcached_server_st *_server_create(memcached_server_st *self, const memc
{
if (not self)
{
{
if (not self)
{
- self=
(memcached_server_st *)libmemcached_malloc(memc, sizeof(memcached_server_st)
);
+ self=
libmemcached_xmalloc(memc, struct memcached_server_st
);
if (not self)
{
if (not self)
{
@@
-132,12
+132,17
@@
memcached_server_st *__server_create_with(memcached_st *memc,
_server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
_server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
- if (
type == MEMCACHED_CONNECTION_UDP
)
+ if (
memc and memcached_is_udp(memc)
)
{
self->write_buffer_offset= UDP_DATAGRAM_HEADER_LENGTH;
memcached_io_init_udp_header(self, 0);
}
{
self->write_buffer_offset= UDP_DATAGRAM_HEADER_LENGTH;
memcached_io_init_udp_header(self, 0);
}
+ if (memc)
+ {
+ set_hostinfo(self);
+ }
+
return self;
}
return self;
}
@@
-197,14
+202,6
@@
memcached_server_st *memcached_server_clone(memcached_server_st *destination,
hostname,
source->port, source->weight,
source->type);
hostname,
source->port, source->weight,
source->type);
- if (destination)
- {
- if (source->error_messages)
- {
- destination->error_messages= memcached_error_copy(*source);
- }
- }
-
return destination;
}
return destination;
}