Final cleanup to remove deprecated BEHAVIOR bit for USER_DATA.

diff --git a/docs/memcached_behavior.pod b/docs/memcached_behavior.pod
index 2268e845976f77905a387fd44e66b5e7f63ea508..1d860c61ab05b9bc7af66226089c9699ac7f0246 100755 (executable)
--- a/docs/memcached_behavior.pod
+++ b/docs/memcached_behavior.pod
@@ -109,7 +109,7 @@ connection.
 
 memcached_behavior_get() returns either the current value of the get, or 0
 or 1 on simple flag behaviors (1 being enabled). memcached_behavior_set()
-returns whether or not the behavior was enabled.
+returns failure or success.
 
 =head1 NOTES
 

diff --git a/libmemcached/memcached_behavior.c b/libmemcached/memcached_behavior.c
index 9269439b87e34fea354334586726c542d33c8884..677e022f9e4cd89df7ac98455cc255c7bcf1305d 100644 (file)
--- a/libmemcached/memcached_behavior.c
+++ b/libmemcached/memcached_behavior.c
@@ -56,9 +56,6 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_SORT_HOSTS:
     set_behavior_flag(ptr, MEM_USE_SORT_HOSTS, data);
     break;
-  case MEMCACHED_BEHAVIOR_USER_DATA:
-    ptr->user_data= data;
-    break;
   case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
     ptr->poll_timeout= (int32_t)data;
     break;
@@ -76,13 +73,15 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
     ptr->recv_size= (int32_t)data;
     memcached_quit(ptr);
     break;
+  case MEMCACHED_BEHAVIOR_USER_DATA:
+    return MEMCACHED_FAILURE;
   }
 
   return MEMCACHED_SUCCESS;
 }
 
-unsigned long long memcached_behavior_get(memcached_st *ptr, 
-                                          memcached_behavior flag)
+uint64_t memcached_behavior_get(memcached_st *ptr, 
+                                memcached_behavior flag)
 {
   memcached_flags temp_flag= 0;
 
@@ -116,8 +115,6 @@ unsigned long long memcached_behavior_get(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_SORT_HOSTS:
     temp_flag= MEM_USE_SORT_HOSTS;
     break;
-  case MEMCACHED_BEHAVIOR_USER_DATA:
-    return 0;
   case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
     {
       return (unsigned long long)ptr->poll_timeout;
@@ -162,6 +159,8 @@ unsigned long long memcached_behavior_get(memcached_st *ptr,
 
       return sock_size;
     }
+  case MEMCACHED_BEHAVIOR_USER_DATA:
+    return MEMCACHED_FAILURE;
   }
 
   WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */

diff --git a/tests/function.c b/tests/function.c
index bcf08fe6c8cdd54dd586830204b2ca2568c81b6a..c72117038474a4d15218a1cb497938cae1abdea5 100644 (file)
--- a/tests/function.c
+++ b/tests/function.c
@@ -1821,7 +1821,8 @@ uint8_t user_supplied_bug14(memcached_st *memc)
                           &string_length, &flags, &rc);
 
     assert(rc == MEMCACHED_SUCCESS);
-    assert(string);
+    if (current_length > 0)
+      assert(string);
     assert(string_length == current_length);
     assert(!memcmp(string, value, string_length));