self->number_of_hosts= 0;
self->cursor_active= 0;
self->port= port;
- self->fd= -1;
+ self->fd= INVALID_SOCKET;
self->io_bytes_sent= 0;
self->server_failure_counter= 0;
self->server_failure_counter_query_id= 0;
static memcached_server_st *_server_create(memcached_server_st *self, const memcached_st *memc)
{
- if (not self)
+ if (self == NULL)
{
- self= (memcached_server_st *)libmemcached_malloc(memc, sizeof(memcached_server_st));
+ self= libmemcached_xmalloc(memc, struct memcached_server_st);
- if (not self)
+ if (self == NULL)
{
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
}
_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);
}
+ if (memc)
+ {
+ set_hostinfo(self);
+ }
+
return self;
}
hostname,
source->port, source->weight,
source->type);
- if (destination)
- {
- if (source->error_messages)
- {
- destination->error_messages= memcached_error_copy(*source);
- }
- }
-
return destination;
}