Portability patches from Kevin Dalley for Freebsd 4.0.

[m6w6/libmemcached] / lib / memcached_behavior.c

diff --git a/lib/memcached_behavior.c b/lib/memcached_behavior.c
index 783d411b15d72acde38b76a9038c941397e98f82..853a33b322bcd891bd36cef64b11b94353df875a 100644 (file)
--- a/lib/memcached_behavior.c
+++ b/lib/memcached_behavior.c
@@ -26,21 +26,34 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
 {
   switch (flag)
   {
+  case MEMCACHED_BEHAVIOR_SUPPORT_CAS:
+    set_behavior_flag(ptr, MEM_SUPPORT_CAS, data);
+    break;
   case MEMCACHED_BEHAVIOR_NO_BLOCK:
     set_behavior_flag(ptr, MEM_NO_BLOCK, data);
     break;
   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_DISTRIBUTION:
+    ptr->distribution= *(memcached_server_distribution *)(data);
+    break;
+  case MEMCACHED_BEHAVIOR_HASH:
+    ptr->hash= *(memcached_hash *)(data);
     break;
-  case MEMCACHED_BEHAVIOR_CRC_HASHING:
-    set_behavior_flag(ptr, MEM_USE_CRC, data);
+  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);
     break;
+  case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
+    {
+      unsigned int timeout= (*((unsigned int *)data));
+
+      ptr->poll_timeout= timeout;
+      break;
+    }
   case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
     {
       ptr->send_size= (*((int *)data));
@@ -67,21 +80,29 @@ unsigned long long memcached_behavior_get(memcached_st *ptr,
 
   switch (flag)
   {
+  case MEMCACHED_BEHAVIOR_SUPPORT_CAS:
+    temp_flag= MEM_SUPPORT_CAS;
+    break;
+  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_CRC_HASHING:
-    temp_flag= MEM_USE_CRC;
-    break;
+  case MEMCACHED_BEHAVIOR_DISTRIBUTION:
+    return ptr->distribution;
+  case MEMCACHED_BEHAVIOR_HASH:
+    return ptr->hash;
   case MEMCACHED_BEHAVIOR_KETAMA:
     temp_flag= MEM_USE_KETAMA;
     break;
+  case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
+    {
+      return (unsigned long long)ptr->poll_timeout;
+    }
   case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
     {
       int sock_size;