projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
New allocator interface.
[m6w6/libmemcached]
/
libmemcached
/
result.c
diff --git
a/libmemcached/result.c
b/libmemcached/result.c
index b9052a1976c07cfed63dbcda13a72bdefa859948..f151160e8159113cd08e67dbd41da2877c7f4407 100644
(file)
--- a/
libmemcached/result.c
+++ b/
libmemcached/result.c
@@
-20,7
+20,8
@@
memcached_result_st *memcached_result_create(memcached_st *memc,
memcached_result_st *ptr)
{
memcached_result_st *memcached_result_create(memcached_st *memc,
memcached_result_st *ptr)
{
- WATCHPOINT_ASSERT(memc && memc->options.is_initialized);
+ WATCHPOINT_ASSERT(memc);
+ WATCHPOINT_ASSERT(memc->options.is_initialized);
/* Saving malloc calls :) */
if (ptr)
/* Saving malloc calls :) */
if (ptr)
@@
-29,7
+30,7
@@
memcached_result_st *memcached_result_create(memcached_st *memc,
}
else
{
}
else
{
- ptr=
memc->call
_calloc(memc, 1, sizeof(memcached_result_st));
+ ptr=
libmemcached
_calloc(memc, 1, sizeof(memcached_result_st));
if (ptr == NULL)
return NULL;
if (ptr == NULL)
return NULL;
@@
-55,14
+56,6
@@
void memcached_result_reset(memcached_result_st *ptr)
ptr->expiration= 0;
}
ptr->expiration= 0;
}
-/*
- NOTE turn into macro
-*/
-memcached_return_t memcached_result_set_value(memcached_result_st *ptr, const char *value, size_t length)
-{
- return memcached_string_append(&ptr->value, value, length);
-}
-
void memcached_result_free(memcached_result_st *ptr)
{
if (ptr == NULL)
void memcached_result_free(memcached_result_st *ptr)
{
if (ptr == NULL)
@@
-72,14
+65,8
@@
void memcached_result_free(memcached_result_st *ptr)
if (memcached_is_allocated(ptr))
{
if (memcached_is_allocated(ptr))
{
- if (ptr->root != NULL)
- {
- ptr->root->call_free(ptr->root, ptr);
- }
- else
- {
- free(ptr);
- }
+ WATCHPOINT_ASSERT(ptr->root); // Without a root, that means that result was not properly initialized.
+ libmemcached_free(ptr->root, ptr);
}
else
{
}
else
{