Updating for version .32

[awesomized/libmemcached] / libmemcached / memcached_fetch.c

diff --git a/libmemcached/memcached_fetch.c b/libmemcached/memcached_fetch.c
index e9939890472c3ee8e12663d94ee021685b608978..d3f012197d6a177a30356b90161650c4739c7653 100644 (file)
--- a/libmemcached/memcached_fetch.c
+++ b/libmemcached/memcached_fetch.c
@@ -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;
   }
@@ -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++)