X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Ffetch.c;h=3c819f38e00392ffa3ac21c2759edb6fdd66338b;hb=4aa2f33b41edf38fcab43010e9e57bf0a512d240;hp=d76f19b21ac5e175f5d4c1a033b5d6db83c6caf1;hpb=7e592f0e6938506a8f9e228b40557c5bb8a10a0b;p=m6w6%2Flibmemcached diff --git a/libmemcached/fetch.c b/libmemcached/fetch.c index d76f19b2..3c819f38 100644 --- a/libmemcached/fetch.c +++ b/libmemcached/fetch.c @@ -37,10 +37,7 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length, *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 @@ 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); @@ -94,13 +91,12 @@ memcached_return_t memcached_fetch_execute(memcached_st *ptr, { memcached_result_st *result= &ptr->result; memcached_return_t rc= MEMCACHED_FAILURE; - unsigned int x; while ((result= memcached_fetch_result(ptr, result, &rc)) != NULL) { if (rc == MEMCACHED_SUCCESS) { - for (x= 0; x < number_of_callbacks; x++) + for (uint32_t x= 0; x < number_of_callbacks; x++) { rc= (*callback[x])(ptr, result, context); if (rc != MEMCACHED_SUCCESS)