Merge in updates for server failure testing.

[awesomized/libmemcached] / libmemcached / callback.cc

diff --git a/libmemcached/callback.cc b/libmemcached/callback.cc
index 9818af4f860e139c543ce84f311092c6533e83c8..bb13a87bc8abb52b0168ef607ae313cd8ef3fe89 100644 (file)
--- a/libmemcached/callback.cc
+++ b/libmemcached/callback.cc
@@ -20,17 +20,17 @@
 
 memcached_return_t memcached_callback_set(memcached_st *ptr,
                                           const memcached_callback_t flag,
-                                          void *data)
+                                          const void *data)
 {
   switch (flag)
   {
   case MEMCACHED_CALLBACK_PREFIX_KEY:
     {
-      return memcached_set_prefix_key(ptr, (char*)data, data ? strlen((char*)data) : 0);
+      return memcached_set_namespace(ptr, (char*)data, data ? strlen((char*)data) : 0);
     }
   case MEMCACHED_CALLBACK_USER_DATA:
     {
-      ptr->user_data= data;
+      ptr->user_data= const_cast<void *>(data);
       break;
     }
   case MEMCACHED_CALLBACK_CLEANUP_FUNCTION:
@@ -78,7 +78,6 @@ memcached_return_t memcached_callback_set(memcached_st *ptr,
       break;
     }
   case MEMCACHED_CALLBACK_MAX:
-  default:
     return MEMCACHED_FAILURE;
   }
 
@@ -91,17 +90,19 @@ void *memcached_callback_get(memcached_st *ptr,
 {
   memcached_return_t local_error;
 
-  if (!error)
+  if (error == NULL)
+  {
     error = &local_error;
+  }
 
   switch (flag)
   {
   case MEMCACHED_CALLBACK_PREFIX_KEY:
     {
-      if (ptr->prefix_key)
+      if (ptr->_namespace)
       {
         *error= MEMCACHED_SUCCESS;
-        return (void *)memcached_array_string(ptr->prefix_key);
+        return (void *)memcached_array_string(ptr->_namespace);
       }
       else
       {
@@ -153,7 +154,7 @@ void *memcached_callback_get(memcached_st *ptr,
     }
   case MEMCACHED_CALLBACK_MAX:
   default:
-    WATCHPOINT_ASSERT(0);
+    assert_msg(0, "Invalid behavior passed to memcached_behavior_set()");
     *error= MEMCACHED_FAILURE;
     return NULL;
   }