projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge from private trunk.
[awesomized/libmemcached]
/
libmemcached
/
fetch.c
diff --git
a/libmemcached/fetch.c
b/libmemcached/fetch.c
index 44f64f33d74004c6af848b8603b9fd6588f024a2..3c819f38e00392ffa3ac21c2759edb6fdd66338b 100644
(file)
--- a/
libmemcached/fetch.c
+++ b/
libmemcached/fetch.c
@@
-37,10
+37,7
@@
char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
*key_length= result_buffer->key_length;
}
*key_length= result_buffer->key_length;
}
- if (result_buffer->item_flags)
- *flags= result_buffer->item_flags;
- else
- *flags= 0;
+ *flags= result_buffer->item_flags;
return memcached_string_c_copy(&result_buffer->value);
}
return memcached_string_c_copy(&result_buffer->value);
}
@@
-94,13
+91,12
@@
memcached_return_t memcached_fetch_execute(memcached_st *ptr,
{
memcached_result_st *result= &ptr->result;
memcached_return_t rc= MEMCACHED_FAILURE;
{
memcached_result_st *result= &ptr->result;
memcached_return_t rc= MEMCACHED_FAILURE;
- unsigned int x;
while ((result= memcached_fetch_result(ptr, result, &rc)) != NULL)
{
if (rc == MEMCACHED_SUCCESS)
{
while ((result= memcached_fetch_result(ptr, result, &rc)) != NULL)
{
if (rc == MEMCACHED_SUCCESS)
{
- for (x= 0; x < number_of_callbacks; x++)
+ for (
uint32_t
x= 0; x < number_of_callbacks; x++)
{
rc= (*callback[x])(ptr, result, context);
if (rc != MEMCACHED_SUCCESS)
{
rc= (*callback[x])(ptr, result, context);
if (rc != MEMCACHED_SUCCESS)