projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge up for version.
[awesomized/libmemcached]
/
libmemcached
/
result.cc
diff --git
a/libmemcached/result.cc
b/libmemcached/result.cc
index 1d0b763df67ab72d89b48cd18be79b6a220ae01f..851337f30facf159c5fe0b59fbbd43587f44bc30 100644
(file)
--- a/
libmemcached/result.cc
+++ b/
libmemcached/result.cc
@@
-52,6
+52,7
@@
static inline void _result_init(memcached_result_st *self,
self->key_length= 0;
self->item_cas= 0;
self->root= memc;
self->key_length= 0;
self->item_cas= 0;
self->root= memc;
+ self->count= 0;
self->item_key[0]= 0;
}
self->item_key[0]= 0;
}
@@
-69,8
+70,10
@@
memcached_result_st *memcached_result_create(const memcached_st *memc,
{
ptr= static_cast<memcached_result_st *>(libmemcached_malloc(memc, sizeof(memcached_result_st)));
{
ptr= static_cast<memcached_result_st *>(libmemcached_malloc(memc, sizeof(memcached_result_st)));
- if (ptr == NULL)
+ if (not ptr)
+ {
return NULL;
return NULL;
+ }
ptr->options.is_allocated= true;
}
ptr->options.is_allocated= true;
}
@@
-80,7
+83,7
@@
memcached_result_st *memcached_result_create(const memcached_st *memc,
_result_init(ptr, (memcached_st *)memc);
WATCHPOINT_SET(ptr->value.options.is_initialized= false);
_result_init(ptr, (memcached_st *)memc);
WATCHPOINT_SET(ptr->value.options.is_initialized= false);
- memcached_string_create(memc, &ptr->value, 0);
+ memcached_string_create(
(memcached_st*)
memc, &ptr->value, 0);
WATCHPOINT_ASSERT_INITIALIZED(&ptr->value);
WATCHPOINT_ASSERT(ptr->value.string == NULL);
WATCHPOINT_ASSERT_INITIALIZED(&ptr->value);
WATCHPOINT_ASSERT(ptr->value.string == NULL);
@@
-98,7
+101,7
@@
void memcached_result_reset(memcached_result_st *ptr)
void memcached_result_free(memcached_result_st *ptr)
{
void memcached_result_free(memcached_result_st *ptr)
{
- if (
ptr == NULL
)
+ if (
not ptr
)
return;
memcached_string_free(&ptr->value);
return;
memcached_string_free(&ptr->value);
@@
-110,6
+113,7
@@
void memcached_result_free(memcached_result_st *ptr)
}
else
{
}
else
{
+ ptr->count= 0;
ptr->options.is_initialized= false;
}
}
ptr->options.is_initialized= false;
}
}
@@
-118,14
+122,12
@@
memcached_return_t memcached_result_set_value(memcached_result_st *ptr,
const char *value,
size_t length)
{
const char *value,
size_t length)
{
- memcached_return_t rc= memcached_string_append(&ptr->value, value, length);
-
- if (rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE)
+ if (memcached_failed(memcached_string_append(&ptr->value, value, length)))
{
{
-
memcached_set_errno(ptr->root, errno, NULL
);
+
return memcached_set_errno(*ptr->root, errno, MEMCACHED_AT
);
}
}
-
return rc
;
+
return MEMCACHED_SUCCESS
;
}
const char *memcached_result_key_value(const memcached_result_st *self)
}
const char *memcached_result_key_value(const memcached_result_st *self)