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-1.0-25
[awesomized/libmemcached]
/
libmemcached
/
server.cc
diff --git
a/libmemcached/server.cc
b/libmemcached/server.cc
index f68e1f6b81bf3ad734fc8535540cb5d869c3319a..20db52b8344ca79c74fefb07db81c739ac262f8d 100644
(file)
--- a/
libmemcached/server.cc
+++ b/
libmemcached/server.cc
@@
-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)