projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix server messages (clean up errors in general).
[m6w6/libmemcached]
/
libmemcached
/
server.cc
diff --git
a/libmemcached/server.cc
b/libmemcached/server.cc
index 2f41584419ad337d35d6c6b3572453b405b5506e..8aba7576e60e4fa661b9ff1aaba75eede009984b 100644
(file)
--- a/
libmemcached/server.cc
+++ b/
libmemcached/server.cc
@@
-55,8
+55,10
@@
static inline void _server_init(memcached_server_st *self, memcached_st *root,
self->server_failure_counter= 0;
self->server_failure_counter_query_id= 0;
self->weight= weight ? weight : 1; // 1 is the default weight value
self->server_failure_counter= 0;
self->server_failure_counter_query_id= 0;
self->weight= weight ? weight : 1; // 1 is the default weight value
- WATCHPOINT_SET(self->io_wait_count.read= 0);
- WATCHPOINT_SET(self->io_wait_count.write= 0);
+ self->io_wait_count.read= 0;
+ self->io_wait_count.write= 0;
+ self->io_wait_count.timeouts= 0;
+ self->io_wait_count._bytes_read= 0;
self->major_version= UINT8_MAX;
self->micro_version= UINT8_MAX;
self->minor_version= UINT8_MAX;
self->major_version= UINT8_MAX;
self->micro_version= UINT8_MAX;
self->minor_version= UINT8_MAX;
@@
-285,9
+287,9
@@
memcached_server_instance_st memcached_server_by_key(memcached_st *ptr,
return NULL;
}
return NULL;
}
- if (memcached_failed(
rc=
(memcached_key_test(*ptr, (const char **)&key, &key_length, 1))))
+ if (memcached_failed((memcached_key_test(*ptr, (const char **)&key, &key_length, 1))))
{
{
- *error=
rc
;
+ *error=
memcached_last_error(ptr)
;
return NULL;
}
return NULL;
}
@@
-310,8
+312,10
@@
void memcached_server_error_reset(memcached_server_st *self)
memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *self)
{
WATCHPOINT_ASSERT(self);
memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *self)
{
WATCHPOINT_ASSERT(self);
- if (not self)
+ if (self == NULL)
+ {
return 0;
return 0;
+ }
return self->last_disconnected_server;
}
return self->last_disconnected_server;
}
@@
-319,8
+323,10
@@
memcached_server_instance_st memcached_server_get_last_disconnect(const memcache
uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
{
WATCHPOINT_ASSERT(servers);
uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
{
WATCHPOINT_ASSERT(servers);
- if (not servers)
+ if (servers == NULL)
+ {
return 0;
return 0;
+ }
return servers->number_of_hosts= count;
}
return servers->number_of_hosts= count;
}
@@
-328,7
+334,7
@@
uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t coun
uint32_t memcached_server_count(const memcached_st *self)
{
WATCHPOINT_ASSERT(self);
uint32_t memcached_server_count(const memcached_st *self)
{
WATCHPOINT_ASSERT(self);
- if (
not self
)
+ if (
self == NULL
)
return 0;
return self->number_of_hosts;
return 0;
return self->number_of_hosts;
@@
-337,7
+343,7
@@
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 (
not self
)
+ if (
self == NULL
)
return NULL;
return self->hostname;
return NULL;
return self->hostname;
@@
-346,8
+352,10
@@
const char *memcached_server_name(const memcached_server_instance_st self)
in_port_t memcached_server_port(const memcached_server_instance_st self)
{
WATCHPOINT_ASSERT(self);
in_port_t memcached_server_port(const memcached_server_instance_st self)
{
WATCHPOINT_ASSERT(self);
- if (not self)
+ if (self == NULL)
+ {
return 0;
return 0;
+ }
return self->port;
}
return self->port;
}
@@
-355,8
+363,10
@@
in_port_t memcached_server_port(const memcached_server_instance_st self)
uint32_t memcached_server_response_count(const memcached_server_instance_st self)
{
WATCHPOINT_ASSERT(self);
uint32_t memcached_server_response_count(const memcached_server_instance_st self)
{
WATCHPOINT_ASSERT(self);
- if (not self)
+ if (self == NULL)
+ {
return 0;
return 0;
+ }
return self->cursor_active;
}
return self->cursor_active;
}