From 99dfc5080113aa8c9efee9fa9fa6a1ed65b2a27c Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Wed, 27 Feb 2008 05:09:33 -0800 Subject: [PATCH] Committing for 0.17. Cleanups and one bad WATCHPOINT removed. --- ChangeLog | 4 +++- include/memcached.h | 2 +- lib/memcached_storage.c | 3 --- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8596982..199536b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,10 @@ -0.17 +0.17 Wed Feb 27 03:33:29 PST 2008 * MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT added for connect timeout in non-block mode. * Incompatible change in memcached_behavior_set() api. We now use a uint64_t, instead of a pointer. + * Fix for storage of values for zero. + * memcached_server_cursor() function added to API for cycling through servers. 0.16 Mon Feb 18 00:30:25 PST 2008 * Work on the UDP protocol diff --git a/include/memcached.h b/include/memcached.h index 2e363295..570404e8 100644 --- a/include/memcached.h +++ b/include/memcached.h @@ -262,7 +262,7 @@ memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity); void memcached_quit(memcached_st *ptr); char *memcached_strerror(memcached_st *ptr, memcached_return rc); memcached_return memcached_behavior_set(memcached_st *ptr, memcached_behavior flag, uint64_t data); -unsigned long long memcached_behavior_get(memcached_st *ptr, memcached_behavior flag); +uint64_t memcached_behavior_get(memcached_st *ptr, memcached_behavior flag); /* All of the functions for adding data to the server */ memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length, diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c index fb3e6b2b..0b5a73e1 100644 --- a/lib/memcached_storage.c +++ b/lib/memcached_storage.c @@ -57,9 +57,6 @@ static inline memcached_return memcached_send(memcached_st *ptr, char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE]; unsigned int server_key; - WATCHPOINT_ASSERT(!(value == NULL && value_length > 0)); - WATCHPOINT_ASSERT(!(value && value_length == 0)); - unlikely (key_length == 0) return MEMCACHED_NO_KEY_PROVIDED; -- 2.30.2