Merge for Dmitry
authorBrian Aker <brian@gaz>
Thu, 18 Feb 2010 22:53:58 +0000 (14:53 -0800)
committerBrian Aker <brian@gaz>
Thu, 18 Feb 2010 22:53:58 +0000 (14:53 -0800)
1  2 
libmemcached/fetch.c

diff --combined libmemcached/fetch.c
index 44f64f33d74004c6af848b8603b9fd6588f024a2,321ff85e7d586f0b0ac473c886ec68cbfdcb3e5a..4359c9355bf006af53a5b1e3d999fa2d263d3483
@@@ -37,10 -37,7 +37,7 @@@ char *memcached_fetch(memcached_st *ptr
      *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);
  }
@@@ -61,7 -58,7 +58,7 @@@ memcached_result_st *memcached_fetch_re
      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);