projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in work to test return types.
[awesomized/libmemcached]
/
libmemcached
/
fetch.cc
diff --git
a/libmemcached/fetch.cc
b/libmemcached/fetch.cc
index 7ef608ddda231c9e9613b62187629aa4f6a4c949..8867d53d0cc711bc5b6cee9c001bd573015c361f 100644
(file)
--- a/
libmemcached/fetch.cc
+++ b/
libmemcached/fetch.cc
@@
-86,7
+86,9
@@
char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
}
if (value_length)
}
if (value_length)
+ {
*value_length= memcached_string_length(&result_buffer->value);
*value_length= memcached_string_length(&result_buffer->value);
+ }
if (key)
{
if (key)
{
@@
-163,7
+165,11
@@
memcached_result_st *memcached_fetch_result(memcached_st *ptr,
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
*error= memcached_response(server, buffer, sizeof(buffer), result);
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
*error= memcached_response(server, buffer, sizeof(buffer), result);
- if (*error == MEMCACHED_SUCCESS)
+ if (*error == MEMCACHED_IN_PROGRESS)
+ {
+ continue;
+ }
+ else if (*error == MEMCACHED_SUCCESS)
{
result->count++;
return result;
{
result->count++;
return result;