X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_behavior.c;h=fb04d72212fd4ecb1f7ed62a730b08c2785c667a;hb=46f12a5edfa0fc0382a9d25355b15d30f857b138;hp=17a0d83bf5ff94bbeed5e70ef22b5f1554cdc992;hpb=c11af7ccccd3260444da4f575022de655d2ffc26;p=awesomized%2Flibmemcached diff --git a/lib/memcached_behavior.c b/lib/memcached_behavior.c index 17a0d83b..fb04d722 100644 --- a/lib/memcached_behavior.c +++ b/lib/memcached_behavior.c @@ -32,8 +32,8 @@ memcached_return memcached_behavior_set(memcached_st *ptr, case MEMCACHED_BEHAVIOR_TCP_NODELAY: set_behavior_flag(ptr, MEM_TCP_NODELAY, data); break; - case MEMCACHED_BEHAVIOR_MD5_HASHING: - set_behavior_flag(ptr, MEM_USE_MD5, data); + case MEMCACHED_BEHAVIOR_HASH: + ptr->hash= *(memcached_hash *)(data); break; case MEMCACHED_BEHAVIOR_KETAMA: set_behavior_flag(ptr, MEM_USE_KETAMA, data); @@ -70,9 +70,8 @@ unsigned long long memcached_behavior_get(memcached_st *ptr, case MEMCACHED_BEHAVIOR_TCP_NODELAY: temp_flag= MEM_TCP_NODELAY; break; - case MEMCACHED_BEHAVIOR_MD5_HASHING: - temp_flag= MEM_USE_MD5; - break; + case MEMCACHED_BEHAVIOR_HASH: + return ptr->hash; case MEMCACHED_BEHAVIOR_KETAMA: temp_flag= MEM_USE_KETAMA; break; @@ -108,7 +107,7 @@ unsigned long long memcached_behavior_get(memcached_st *ptr, } } - assert(temp_flag); /* Programming mistake if it gets this far */ + WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */ if (ptr->flags & temp_flag) return 1; else