projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Removed issue around zero length returns now being valid. Fixed memory leak
[m6w6/libmemcached]
/
tests
/
function.c
diff --git
a/tests/function.c
b/tests/function.c
index 826e6c82e808961849f68025d366cb048c34d492..a08e1eaabbf569f333e1c7ca3f44b8056f3c012c 100644
(file)
--- a/
tests/function.c
+++ b/
tests/function.c
@@
-67,7
+67,7
@@
memcached_return server_display_function(memcached_st *ptr, memcached_server_st
/* Do Nothing */
uint32_t bigger= *((uint32_t *)(context));
assert(bigger <= server->port);
/* Do Nothing */
uint32_t bigger= *((uint32_t *)(context));
assert(bigger <= server->port);
- *((uint32_t *)(context))=
bigger
;
+ *((uint32_t *)(context))=
server->port
;
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
@@
-117,13
+117,13
@@
uint8_t server_unsort_test(memcached_st *ptr)
{
uint8_t x;
uint32_t counter= 0; /* Prime the value for the assert in server_display_function */
{
uint8_t x;
uint32_t counter= 0; /* Prime the value for the assert in server_display_function */
+ uint32_t bigger= 0; /* Prime the value for the assert in server_display_function */
memcached_return rc;
memcached_server_function callbacks[1];
memcached_st *local_memc;
local_memc= memcached_create(NULL);
assert(local_memc);
memcached_return rc;
memcached_server_function callbacks[1];
memcached_st *local_memc;
local_memc= memcached_create(NULL);
assert(local_memc);
- memcached_behavior_set(local_memc, MEMCACHED_BEHAVIOR_SORT_HOSTS, 1);
for (x= 0; x < TEST_PORT_COUNT; x++)
{
for (x= 0; x < TEST_PORT_COUNT; x++)
{
@@
-137,6
+137,11
@@
uint8_t server_unsort_test(memcached_st *ptr)
callbacks[0]= server_display_unsort_function;
memcached_server_cursor(local_memc, callbacks, (void *)&counter, 1);
callbacks[0]= server_display_unsort_function;
memcached_server_cursor(local_memc, callbacks, (void *)&counter, 1);
+ /* Now we sort old data! */
+ memcached_behavior_set(local_memc, MEMCACHED_BEHAVIOR_SORT_HOSTS, 1);
+ callbacks[0]= server_display_function;
+ memcached_server_cursor(local_memc, callbacks, (void *)&bigger, 1);
+
memcached_free(local_memc);
memcached_free(local_memc);
@@
-615,6
+620,7
@@
uint8_t read_through(memcached_st *memc)
assert(rc == MEMCACHED_SUCCESS);
assert(string_length == strlen(READ_THROUGH_VALUE));
assert(!strcmp(READ_THROUGH_VALUE, string));
assert(rc == MEMCACHED_SUCCESS);
assert(string_length == strlen(READ_THROUGH_VALUE));
assert(!strcmp(READ_THROUGH_VALUE, string));
+ free(string);
string= memcached_get(memc, key, strlen(key),
&string_length, &flags, &rc);
string= memcached_get(memc, key, strlen(key),
&string_length, &flags, &rc);
@@
-622,6
+628,7
@@
uint8_t read_through(memcached_st *memc)
assert(rc == MEMCACHED_SUCCESS);
assert(string_length == strlen(READ_THROUGH_VALUE));
assert(!strcmp(READ_THROUGH_VALUE, string));
assert(rc == MEMCACHED_SUCCESS);
assert(string_length == strlen(READ_THROUGH_VALUE));
assert(!strcmp(READ_THROUGH_VALUE, string));
+ free(string);
return 0;
}
return 0;
}
@@
-1945,8
+1952,6
@@
uint8_t user_supplied_bug14(memcached_st *memc)
&string_length, &flags, &rc);
assert(rc == MEMCACHED_SUCCESS);
&string_length, &flags, &rc);
assert(rc == MEMCACHED_SUCCESS);
- if (current_length > 0)
- assert(string);
assert(string_length == current_length);
assert(!memcmp(string, value, string_length));
assert(string_length == current_length);
assert(!memcmp(string, value, string_length));