X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_storage.c;h=38d6d0db3ca689ccb75d3717bdef30930ab488a9;hb=4a302893e1e1dbd22355a287b55fafa861963cd2;hp=3f55796d52b6e5f92375f6113e6581be7e8f3a7d;hpb=6f50a6acc95303396a8a073c3746cdff83df2301;p=m6w6%2Flibmemcached diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c index 3f55796d..38d6d0db 100644 --- a/lib/memcached_storage.c +++ b/lib/memcached_storage.c @@ -20,7 +20,7 @@ typedef enum { } memcached_storage_action; /* Inline this */ -char *storage_op_string(memcached_storage_action verb) +static char *storage_op_string(memcached_storage_action verb) { switch (verb) { @@ -96,7 +96,7 @@ static inline memcached_return memcached_send(memcached_st *ptr, goto error; } - if ((ptr->flags & MEM_NO_BLOCK) && verb == SET_OP) + if ((ptr->flags & MEM_BUFFER_REQUESTS) && verb == SET_OP) to_write= 0; else to_write= 1; @@ -108,14 +108,10 @@ static inline memcached_return memcached_send(memcached_st *ptr, } if (to_write == 0) - { - rc= MEMCACHED_SUCCESS; - memcached_server_response_increment(ptr, server_key); - } - else - { - rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key); - } + return MEMCACHED_BUFFERED; + + rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL, server_key); + if (rc == MEMCACHED_STORED) return MEMCACHED_SUCCESS; else