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 f2f78211fe35beedb73ce138f64d4e950cf97677..8aba7576e60e4fa661b9ff1aaba75eede009984b 100644
(file)
--- a/
libmemcached/server.cc
+++ b/
libmemcached/server.cc
@@
-58,6
+58,7
@@
static inline void _server_init(memcached_server_st *self, memcached_st *root,
self->io_wait_count.read= 0;
self->io_wait_count.write= 0;
self->io_wait_count.timeouts= 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;
@@
-352,7
+353,9
@@
in_port_t memcached_server_port(const memcached_server_instance_st self)
{
WATCHPOINT_ASSERT(self);
if (self == NULL)
{
WATCHPOINT_ASSERT(self);
if (self == NULL)
+ {
return 0;
return 0;
+ }
return self->port;
}
return self->port;
}
@@
-361,7
+364,9
@@
uint32_t memcached_server_response_count(const memcached_server_instance_st self
{
WATCHPOINT_ASSERT(self);
if (self == NULL)
{
WATCHPOINT_ASSERT(self);
if (self == NULL)
+ {
return 0;
return 0;
+ }
return self->cursor_active;
}
return self->cursor_active;
}