projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update hardening flags.
[awesomized/libmemcached]
/
libmemcached
/
server.cc
diff --git
a/libmemcached/server.cc
b/libmemcached/server.cc
index 6dca4ab61f38b47570455e0230aceb45b262944c..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)
@@
-219,7
+221,7
@@
uint32_t memcached_server_response_count(const memcached_server_instance_st self
return 0;
}
return 0;
}
- return self->cursor_active;
+ return self->cursor_active
_
;
}
const char *memcached_server_type(const memcached_server_instance_st ptr)
}
const char *memcached_server_type(const memcached_server_instance_st ptr)