X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_behavior.c;h=1ce495afe336ee27e0d28ef78325afe82e6450f3;hb=7add2cb42be7d072888ab916eb35cdef8a2774a1;hp=7383b4e22d400c85a8f444e4c6c2923e19370bc0;hpb=92f0cfa45cc559ee5c8445de737cd7a7b220502d;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_behavior.c b/lib/memcached_behavior.c
index 7383b4e2..1ce495af 100644
--- a/lib/memcached_behavior.c
+++ b/lib/memcached_behavior.c
@@ -9,31 +9,35 @@
   We quit all connections so we can reset the sockets.
 */
 
+void set_behavior_flag(memcached_st *ptr, memcached_flags temp_flag, void *data)
+{
+  unsigned int *truefalse= (unsigned int *)data;
+
+  memcached_quit(ptr);
+  if (truefalse)
+    ptr->flags|= temp_flag;
+  else
+    ptr->flags+= temp_flag;
+}
+
 memcached_return memcached_behavior_set(memcached_st *ptr, 
                                         memcached_behavior flag, 
                                         void *data)
 {
-  memcached_flags temp_flag;
-
   switch (flag)
   {
   case MEMCACHED_BEHAVIOR_NO_BLOCK:
-    temp_flag= MEM_NO_BLOCK;
+    set_behavior_flag(ptr, MEM_NO_BLOCK, data);
+    break;
   case MEMCACHED_BEHAVIOR_TCP_NODELAY:
-    temp_flag= MEM_TCP_NODELAY;
+    set_behavior_flag(ptr, MEM_TCP_NODELAY, data);
+    break;
   case MEMCACHED_BEHAVIOR_MD5_HASHING:
-    temp_flag= MEM_USE_MD5;
+    set_behavior_flag(ptr, MEM_USE_MD5, data);
+    break;
   case MEMCACHED_BEHAVIOR_KETAMA:
-    temp_flag= MEM_USE_KETAMA;
-    {
-      unsigned int *truefalse= (unsigned int *)data;
-      memcached_quit(ptr);
-      if (truefalse)
-        ptr->flags|= temp_flag;
-      else
-        ptr->flags+= temp_flag;
-      break;
-    }
+    set_behavior_flag(ptr, MEM_USE_KETAMA, data);
+    break;
   }
 
   return MEMCACHED_SUCCESS;
@@ -48,17 +52,22 @@ unsigned long long memcached_behavior_get(memcached_st *ptr,
   {
   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_KETAMA:
     temp_flag= MEM_USE_KETAMA;
-    if (ptr->flags & temp_flag)
-      return 1;
-    else
-      return 0;
+    break;
   }
 
+  if (ptr->flags & temp_flag)
+    return 1;
+  else
+    return 0;
+
   return MEMCACHED_SUCCESS;
 }