projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update hardening flags.
[awesomized/libmemcached]
/
libmemcached
/
get.cc
diff --git
a/libmemcached/get.cc
b/libmemcached/get.cc
index cc6af2d83357cf4c56e48f7dc879a7b87a4df311..b774e7d5e775eea011caff5d2171d93d39378578 100644
(file)
--- a/
libmemcached/get.cc
+++ b/
libmemcached/get.cc
@@
-244,7
+244,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
*/
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
*/
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
-
memcached_server_write_instance_st instance= memcached_server
_instance_fetch(ptr, x);
+
org::libmemcached::Instance* instance= memcached
_instance_fetch(ptr, x);
if (memcached_instance_response_count(instance))
{
if (memcached_instance_response_count(instance))
{
@@
-282,7
+282,6
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
size_t hosts_connected= 0;
for (uint32_t x= 0; x < number_of_keys; x++)
{
size_t hosts_connected= 0;
for (uint32_t x= 0; x < number_of_keys; x++)
{
- memcached_server_write_instance_st instance;
uint32_t server_key;
if (is_group_key_set)
uint32_t server_key;
if (is_group_key_set)
@@
-294,7
+293,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
server_key= memcached_generate_hash_with_redistribution(ptr, keys[x], key_length[x]);
}
server_key= memcached_generate_hash_with_redistribution(ptr, keys[x], key_length[x]);
}
-
instance= memcached_server
_instance_fetch(ptr, server_key);
+
org::libmemcached::Instance* instance= memcached
_instance_fetch(ptr, server_key);
libmemcached_io_vector_st vector[]=
{
libmemcached_io_vector_st vector[]=
{
@@
-321,9
+320,9
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
failures_occured_in_sending= true;
continue;
}
failures_occured_in_sending= true;
continue;
}
- WATCHPOINT_ASSERT(instance->cursor_active == 0);
+ WATCHPOINT_ASSERT(instance->cursor_active
_
== 0);
memcached_instance_response_increment(instance);
memcached_instance_response_increment(instance);
- WATCHPOINT_ASSERT(instance->cursor_active == 1);
+ WATCHPOINT_ASSERT(instance->cursor_active
_
== 1);
}
else
{
}
else
{
@@
-355,8
+354,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
bool success_happened= false;
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
bool success_happened= false;
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
- memcached_server_write_instance_st instance=
- memcached_server_instance_fetch(ptr, x);
+ org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
if (memcached_instance_response_count(instance))
{
if (memcached_instance_response_count(instance))
{
@@
-480,7
+478,7
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
server_key= memcached_generate_hash_with_redistribution(ptr, keys[x], key_length[x]);
}
server_key= memcached_generate_hash_with_redistribution(ptr, keys[x], key_length[x]);
}
-
memcached_server_write_instance_st instance= memcached_server
_instance_fetch(ptr, server_key);
+
org::libmemcached::Instance* instance= memcached
_instance_fetch(ptr, server_key);
if (memcached_instance_response_count(instance) == 0)
{
if (memcached_instance_response_count(instance) == 0)
{
@@
-553,7
+551,7
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
for (uint32_t x= 0; x < memcached_server_count(ptr); ++x)
{
for (uint32_t x= 0; x < memcached_server_count(ptr); ++x)
{
-
memcached_server_write_instance_st instance= memcached_server
_instance_fetch(ptr, x);
+
org::libmemcached::Instance* instance= memcached
_instance_fetch(ptr, x);
initialize_binary_request(instance, request.message.header);
if (memcached_instance_response_count(instance))
initialize_binary_request(instance, request.message.header);
if (memcached_instance_response_count(instance))
@@
-624,7
+622,7
@@
static memcached_return_t replication_binary_mget(memcached_st *ptr,
continue;
}
continue;
}
-
memcached_server_write_instance_st instance= memcached_server
_instance_fetch(ptr, server);
+
org::libmemcached::Instance* instance= memcached
_instance_fetch(ptr, server);
if (memcached_instance_response_count(instance) == 0)
{
if (memcached_instance_response_count(instance) == 0)
{