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-55
[awesomized/libmemcached]
/
libmemcached
/
server.hpp
diff --git
a/libmemcached/server.hpp
b/libmemcached/server.hpp
index 191402e8a8b56a66f17e444fa7c3470d0445716c..2719294f9cf3d4fd626b1fcda9ec14d6292ae8c0 100644
(file)
--- a/
libmemcached/server.hpp
+++ b/
libmemcached/server.hpp
@@
-60,20
+60,14
@@
void __server_free(memcached_server_st *);
static inline bool memcached_is_valid_servername(const memcached_string_t& arg)
{
static inline bool memcached_is_valid_servername(const memcached_string_t& arg)
{
- return arg.size
> 0 or arg.size
< NI_MAXHOST;
+ return arg.size < NI_MAXHOST;
}
}
-static inline void memcached_mark_server_as_clean(memcached_server_write_instance_st server)
-{
- server->server_failure_counter= 0;
- server->next_retry= 0;
-}
-
-void memcached_instance_free(memcached_instance_st *);
+void memcached_instance_free(org::libmemcached::Instance *);
-void set_last_disconnected_host(
memcached_server_write_instance_st
self);
+void set_last_disconnected_host(
org::libmemcached::Instance*
self);
-static inline void memcached_mark_server_for_timeout(
memcached_server_write_instance_st
server)
+static inline void memcached_mark_server_for_timeout(
org::libmemcached::Instance*
server)
{
if (server->state != MEMCACHED_SERVER_STATE_IN_TIMEOUT)
{
{
if (server->state != MEMCACHED_SERVER_STATE_IN_TIMEOUT)
{