projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
cc47230
)
Remove dead local call.
author
Brian Aker
<brian@tangent.org>
Mon, 9 Jul 2012 21:14:49 +0000
(14:14 -0700)
committer
Brian Aker
<brian@tangent.org>
Mon, 9 Jul 2012 21:14:49 +0000
(14:14 -0700)
libmemcached/instance.hpp
patch
|
blob
|
history
libmemcached/server_list.cc
patch
|
blob
|
history
libmemcached/server_list.hpp
patch
|
blob
|
history
libtest/server_container.cc
patch
|
blob
|
history
diff --git
a/libmemcached/instance.hpp
b/libmemcached/instance.hpp
index 1c614ab1f30db75f4855f517ee23a670c98d9ea8..e8d44058a535dffa75ca0a6a3c5fb233f35786af 100644
(file)
--- a/
libmemcached/instance.hpp
+++ b/
libmemcached/instance.hpp
@@
-53,8
+53,6
@@
memcached_return_t memcached_instance_push(memcached_st *ptr, const org::libmemc
memcached_server_st *memcached_instance_2_server(org::libmemcached::Instance* source);
memcached_server_st *memcached_instance_2_server(org::libmemcached::Instance* source);
-uint32_t memcached_instance_count(const memcached_st* self);
-
uint32_t memcached_instance_response_count(const org::libmemcached::Instance* self);
void __instance_free(org::libmemcached::Instance *);
uint32_t memcached_instance_response_count(const org::libmemcached::Instance* self);
void __instance_free(org::libmemcached::Instance *);
diff --git
a/libmemcached/server_list.cc
b/libmemcached/server_list.cc
index 57d5c7fe1153bd2cd72d75757e390a7b1d723f78..4b3c62934583e2f260275bcb894a399995dc96f6 100644
(file)
--- a/
libmemcached/server_list.cc
+++ b/
libmemcached/server_list.cc
@@
-126,13
+126,6
@@
uint32_t memcached_instance_list_count(const memcached_st* self)
: self->number_of_hosts;
}
: self->number_of_hosts;
}
-uint32_t memcached_instance_count(const memcached_st* self)
-{
- return (self == NULL)
- ? 0
- : self->number_of_hosts;
-}
-
void memcached_instance_set(memcached_st* memc, org::libmemcached::Instance* list)
{
memc->servers= list;
void memcached_instance_set(memcached_st* memc, org::libmemcached::Instance* list)
{
memc->servers= list;
diff --git
a/libmemcached/server_list.hpp
b/libmemcached/server_list.hpp
index 2a8052fac3d831778f99740b114f219583085596..95920194b5d6913313e68a01c3aa835b763c6158 100644
(file)
--- a/
libmemcached/server_list.hpp
+++ b/
libmemcached/server_list.hpp
@@
-38,8
+38,6
@@
org::libmemcached::Instance* memcached_instance_list(const memcached_st *);
org::libmemcached::Instance* memcached_instance_list(const memcached_st *);
-uint32_t memcached_instance_count(const memcached_st*);
-
uint32_t memcached_instance_list_count(const memcached_st*);
uint32_t memcached_servers_set_count(memcached_server_list_st servers, uint32_t count);
uint32_t memcached_instance_list_count(const memcached_st*);
uint32_t memcached_servers_set_count(memcached_server_list_st servers, uint32_t count);
diff --git
a/libtest/server_container.cc
b/libtest/server_container.cc
index 2bea1ad96bac82040aed43edaf3380e5cf7dea82..6973937bc6f8749de1ef7da815c027336fd1ba0f 100644
(file)
--- a/
libtest/server_container.cc
+++ b/
libtest/server_container.cc
@@
-99,7
+99,6
@@
Server* server_startup_st::pop_server()
// host_to_shutdown => host number to shutdown in array
bool server_startup_st::shutdown(uint32_t host_to_shutdown)
{
// host_to_shutdown => host number to shutdown in array
bool server_startup_st::shutdown(uint32_t host_to_shutdown)
{
- Error << servers.size() << " > " << host_to_shutdown;
if (servers.size() > host_to_shutdown)
{
Server* tmp= servers[host_to_shutdown];
if (servers.size() > host_to_shutdown)
{
Server* tmp= servers[host_to_shutdown];