Merge lp:~dmitry-isaikin/libmemcached/br1 into lp:~tangent-org/libmemcached/trunk

[Dmitry Isaykin]

[Dmitry Isaykin (dmitry-isaikin)]

removed dummy if-else in memcached_fetch:

- if (result_buffer->item_flags)
- *flags= result_buffer->item_flags;
- else
- *flags= 0;
+ *flags= result_buffer->item_flags;

P.S. Maybe this code must be fixed like that:
- if (result_buffer->item_flags)
- *flags= result_buffer->item_flags;
- else
- *flags= 0;
+ if (flags)
+ *flags= result_buffer->item_flags;

but this code only adds extra branching for some useless convenience for caller (caller can use memcached_fetch with NULL-pointer in @flags parameter). (in existing codebase memcached_fetch always called with not-NULL pointer @flags)

=== modified file 'libmemcached/fetch.c'
--- libmemcached/fetch.c	2010-01-19 00:39:46 +0000
+++ libmemcached/fetch.c	2010-02-15 21:27:14 +0000
@@ -37,10 +37,7 @@
     *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);
 }