X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_fetch.c;h=d3f012197d6a177a30356b90161650c4739c7653;hb=c204651e1ee8185224ccc78bd68801ab43740844;hp=07bfdda92287576ed95d64489a902c62deb2e635;hpb=522a9124f1b0ec147d791abfbf8bdafe61681e91;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached_fetch.c b/libmemcached/memcached_fetch.c
index 07bfdda9..d3f01219 100644
--- 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;
 
-  if (ptr->flags & MEM_USE_UDP)
+  unlikely (ptr->flags & MEM_USE_UDP)
   {
     *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);
 
-  if (*error != MEMCACHED_SUCCESS || result_buffer == NULL)
+  if (result_buffer == NULL || *error != MEMCACHED_SUCCESS)
   {
+    WATCHPOINT_ASSERT(result_buffer == NULL);
     *value_length= 0;
     return NULL;
   }
@@ -44,7 +45,7 @@ memcached_result_st *memcached_fetch_result(memcached_st *ptr,
 {
   memcached_server_st *server;
 
-  if (ptr->flags & MEM_USE_UDP)
+  unlikely (ptr->flags & MEM_USE_UDP)
   {
     *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;
 
-  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);
 
@@ -84,7 +86,8 @@ memcached_return memcached_fetch_execute(memcached_st *ptr,
   memcached_return rc= MEMCACHED_FAILURE;
   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++)