projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-202
[awesomized/libmemcached]
/
libmemcached
/
server.cc
diff --git
a/libmemcached/server.cc
b/libmemcached/server.cc
index f68e1f6b81bf3ad734fc8535540cb5d869c3319a..27e51e96691784cab0c3281c358dd29367e54ac0 100644
(file)
--- a/
libmemcached/server.cc
+++ b/
libmemcached/server.cc
@@
-40,7
+40,7
@@
*/
#include <libmemcached/common.h>
*/
#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)
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;
}
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)
{
{
if (self == NULL)
{
@@
-105,7
+105,7
@@
static memcached_server_st *_server_create(memcached_server_st *self, const memc
return self;
}
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,
memcached_server_st* allocated_instance,
const memcached_string_t& hostname,
const in_port_t port,
@@
-125,7
+125,7
@@
memcached_server_st *__server_create_with(memcached_st *memc,
return NULL;
}
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;
}
return allocated_instance;
}
@@
-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);
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)
}
in_port_t memcached_server_port(const memcached_server_instance_st self)