projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Rename non-api call, from looking like an API call.
[m6w6/libmemcached]
/
tests
/
libmemcached-1.0
/
mem_functions.cc
diff --git
a/tests/libmemcached-1.0/mem_functions.cc
b/tests/libmemcached-1.0/mem_functions.cc
index f8ac3da67ce8a15482bd91dfa13115ff913c9cb1..cb4666c3153b05fe4cf366ce77c39d1f8941881a 100644
(file)
--- a/
tests/libmemcached-1.0/mem_functions.cc
+++ b/
tests/libmemcached-1.0/mem_functions.cc
@@
-1026,12
+1026,11
@@
test_return_t bad_key_test(memcached_st *memc)
}
#define READ_THROUGH_VALUE "set for me"
}
#define READ_THROUGH_VALUE "set for me"
-static memcached_return_t read_through_trigger(memcached_st *
memc,
- char *
key,
- size_t key_length,
+static memcached_return_t read_through_trigger(memcached_st *
, // memc
+ char *
, // key
+ size_t
, //
key_length,
memcached_result_st *result)
{
memcached_result_st *result)
{
- (void)memc;(void)key;(void)key_length;
return memcached_result_set_value(result, READ_THROUGH_VALUE, strlen(READ_THROUGH_VALUE));
}
return memcached_result_set_value(result, READ_THROUGH_VALUE, strlen(READ_THROUGH_VALUE));
}
@@
-1062,8
+1061,8
@@
test_return_t read_through(memcached_st *memc)
&string_length, &flags, &rc);
test_compare(MEMCACHED_SUCCESS, rc);
&string_length, &flags, &rc);
test_compare(MEMCACHED_SUCCESS, rc);
- test_compare(s
tring_length, sizeof(READ_THROUGH_VALUE) -1
);
- test_
true(string[sizeof(READ_THROUGH_VALUE) -1] == 0
);
+ test_compare(s
izeof(READ_THROUGH_VALUE) -1, string_length
);
+ test_
compare(0, string[sizeof(READ_THROUGH_VALUE) -1]
);
test_strcmp(READ_THROUGH_VALUE, string);
free(string);
test_strcmp(READ_THROUGH_VALUE, string);
free(string);
@@
-4652,7
+4651,7
@@
test_return_t regression_bug_854604(memcached_st *)
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
-static void
memcached_di
e(memcached_st* mc, memcached_return error, const char* what, uint32_t it)
+static void
die_messag
e(memcached_st* mc, memcached_return error, const char* what, uint32_t it)
{
fprintf(stderr, "Iteration #%u: ", it);
{
fprintf(stderr, "Iteration #%u: ", it);
@@
-4688,19
+4687,19
@@
test_return_t regression_bug_(memcached_st *memc)
rc= memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1);
if (rc != MEMCACHED_SUCCESS)
{
rc= memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1);
if (rc != MEMCACHED_SUCCESS)
{
-
memcached_di
e(mc, rc, "memcached_behavior_set", x);
+
die_messag
e(mc, rc, "memcached_behavior_set", x);
}
rc= memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_CACHE_LOOKUPS, 1);
if (rc != MEMCACHED_SUCCESS)
{
}
rc= memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_CACHE_LOOKUPS, 1);
if (rc != MEMCACHED_SUCCESS)
{
-
memcached_di
e(mc, rc, "memcached_behavior_set", x);
+
die_messag
e(mc, rc, "memcached_behavior_set", x);
}
rc= memcached_server_add(mc, remote_server, 0);
if (rc != MEMCACHED_SUCCESS)
{
}
rc= memcached_server_add(mc, remote_server, 0);
if (rc != MEMCACHED_SUCCESS)
{
-
memcached_di
e(mc, rc, "memcached_server_add", x);
+
die_messag
e(mc, rc, "memcached_server_add", x);
}
const char *set_key= "akey";
}
const char *set_key= "akey";
@@
-4720,7
+4719,7
@@
test_return_t regression_bug_(memcached_st *memc)
&get_value_flags, &rc);
if (rc != MEMCACHED_SUCCESS)
{
&get_value_flags, &rc);
if (rc != MEMCACHED_SUCCESS)
{
-
memcached_di
e(mc, rc, "memcached_get", x);
+
die_messag
e(mc, rc, "memcached_get", x);
}
else
{
}
else
{
@@
-4744,7
+4743,7
@@
test_return_t regression_bug_(memcached_st *memc)
);
if (rc != MEMCACHED_SUCCESS)
{
);
if (rc != MEMCACHED_SUCCESS)
{
-
memcached_di
e(mc, rc, "memcached_set", x);
+
die_messag
e(mc, rc, "memcached_set", x);
}
}
}
}