projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix typo
[awesomized/libmemcached]
/
libmemcached
/
memcached_fetch.c
diff --git
a/libmemcached/memcached_fetch.c
b/libmemcached/memcached_fetch.c
index 28e84ed903c6c1dbef622399bda481aab2cc278a..9c31e2b01a6cc6e260080eaaa4c7e79a6535cc3b 100644
(file)
--- a/
libmemcached/memcached_fetch.c
+++ b/
libmemcached/memcached_fetch.c
@@
-8,7
+8,7
@@
char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
{
memcached_result_st *result_buffer= &ptr->result;
{
memcached_result_st *result_buffer= &ptr->result;
-
if
(ptr->flags & MEM_USE_UDP)
+
unlikely
(ptr->flags & MEM_USE_UDP)
{
*error= MEMCACHED_NOT_SUPPORTED;
return NULL;
{
*error= MEMCACHED_NOT_SUPPORTED;
return NULL;
@@
-16,8
+16,9
@@
char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
result_buffer= memcached_fetch_result(ptr, result_buffer, error);
result_buffer= memcached_fetch_result(ptr, result_buffer, error);
- if (*error != MEMCACHED_SUCCESS)
+ if (
result_buffer == NULL ||
*error != MEMCACHED_SUCCESS)
{
{
+ WATCHPOINT_ASSERT(result_buffer == NULL);
*value_length= 0;
return NULL;
}
*value_length= 0;
return NULL;
}
@@
-44,7
+45,7
@@
memcached_result_st *memcached_fetch_result(memcached_st *ptr,
{
memcached_server_st *server;
{
memcached_server_st *server;
-
if
(ptr->flags & MEM_USE_UDP)
+
unlikely
(ptr->flags & MEM_USE_UDP)
{
*error= MEMCACHED_NOT_SUPPORTED;
return NULL;
{
*error= MEMCACHED_NOT_SUPPORTED;
return NULL;
@@
-54,7
+55,8
@@
memcached_result_st *memcached_fetch_result(memcached_st *ptr,
if ((result= memcached_result_create(ptr, NULL)) == NULL)
return NULL;
if ((result= memcached_result_create(ptr, NULL)) == NULL)
return NULL;
- while ((server = memcached_io_get_readable_server(ptr)) != NULL) {
+ while ((server = memcached_io_get_readable_server(ptr)) != NULL)
+ {
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);
@@
-62,7
+64,7
@@
memcached_result_st *memcached_fetch_result(memcached_st *ptr,
return result;
else if (*error == MEMCACHED_END)
memcached_server_response_reset(server);
return result;
else if (*error == MEMCACHED_END)
memcached_server_response_reset(server);
- else
+ else
if (*error != MEMCACHED_NOTFOUND)
break;
}
break;
}
@@
-81,10
+83,11
@@
memcached_return memcached_fetch_execute(memcached_st *ptr,
unsigned int number_of_callbacks)
{
memcached_result_st *result= &ptr->result;
unsigned int number_of_callbacks)
{
memcached_result_st *result= &ptr->result;
- memcached_return rc;
+ memcached_return rc
= MEMCACHED_FAILURE
;
unsigned int x;
unsigned int x;
- while ((result= memcached_fetch_result(ptr, result, &rc)) != NULL) {
+ while ((result= memcached_fetch_result(ptr, result, &rc)) != NULL)
+ {
if (rc == MEMCACHED_SUCCESS)
{
for (x= 0; x < number_of_callbacks; x++)
if (rc == MEMCACHED_SUCCESS)
{
for (x= 0; x < number_of_callbacks; x++)