projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in trunk
[m6w6/libmemcached]
/
libmemcached
/
io.cc
diff --git
a/libmemcached/io.cc
b/libmemcached/io.cc
index 48e5ecffbe789846e832f297fa6bdb79388920d1..d2e40043dfaa1c958ae1e346ed8dc1dbacb6bd3a 100644
(file)
--- a/
libmemcached/io.cc
+++ b/
libmemcached/io.cc
@@
-287,7
+287,7
@@
static memcached_return_t io_wait(memcached_server_write_instance_st ptr,
if (memcached_has_error(ptr))
{
if (memcached_has_error(ptr))
{
- return memcached_
server
_error_return(ptr);
+ return memcached_
instance
_error_return(ptr);
}
return memcached_set_error(*ptr, MEMCACHED_CONNECTION_FAILURE, MEMCACHED_AT,
}
return memcached_set_error(*ptr, MEMCACHED_CONNECTION_FAILURE, MEMCACHED_AT,
@@
-449,7
+449,7
@@
static memcached_return_t _io_fill(memcached_server_write_instance_st ptr)
break;
}
break;
}
- return memcached_
server
_error_return(ptr);
+ return memcached_
instance
_error_return(ptr);
}
else if (data_read == 0)
{
}
else if (data_read == 0)
{
@@
-729,11
+729,11
@@
memcached_server_write_instance_st memcached_io_get_readable_server(memcached_st
return instance;
}
return instance;
}
- if (memcached_
server
_response_count(instance) > 0)
+ if (memcached_
instance
_response_count(instance) > 0)
{
{
- fds[host_index].events
= POLLIN;
- fds[host_index].revents
= 0;
- fds[host_index].fd
= instance->fd;
+ fds[host_index].events= POLLIN;
+ fds[host_index].revents= 0;
+ fds[host_index].fd= instance->fd;
++host_index;
}
}
++host_index;
}
}
@@
-743,10
+743,9
@@
memcached_server_write_instance_st memcached_io_get_readable_server(memcached_st
/* We have 0 or 1 server with pending events.. */
for (uint32_t x= 0; x< memcached_server_count(memc); ++x)
{
/* We have 0 or 1 server with pending events.. */
for (uint32_t x= 0; x< memcached_server_count(memc); ++x)
{
- memcached_server_write_instance_st instance=
- memcached_server_instance_fetch(memc, x);
+ memcached_server_write_instance_st instance= memcached_server_instance_fetch(memc, x);
- if (memcached_
server
_response_count(instance) > 0)
+ if (memcached_
instance
_response_count(instance) > 0)
{
return instance;
}
{
return instance;
}