X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmemcached_behavior.c;h=67a52fa8ac212c18bc9a37cbced1f1abe728aa06;hb=8d0cd77fc7bafd1f353bc7c50910b751766f931a;hp=17a0d83bf5ff94bbeed5e70ef22b5f1554cdc992;hpb=c11af7ccccd3260444da4f575022de655d2ffc26;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_behavior.c b/lib/memcached_behavior.c
index 17a0d83b..67a52fa8 100644
--- a/lib/memcached_behavior.c
+++ b/lib/memcached_behavior.c
@@ -32,8 +32,11 @@ 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_CACHE_LOOKUPS:
+    set_behavior_flag(ptr, MEM_USE_CACHE_LOOKUPS, data);
     break;
   case MEMCACHED_BEHAVIOR_KETAMA:
     set_behavior_flag(ptr, MEM_USE_KETAMA, data);
@@ -64,15 +67,17 @@ unsigned long long memcached_behavior_get(memcached_st *ptr,
 
   switch (flag)
   {
+  case MEMCACHED_BEHAVIOR_CACHE_LOOKUPS:
+    temp_flag= MEM_USE_CACHE_LOOKUPS;
+    break;
   case MEMCACHED_BEHAVIOR_NO_BLOCK:
     temp_flag= MEM_NO_BLOCK;
     break;
   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 +113,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