Deprecate the old callback interface to set the memory allocators

diff --git a/libmemcached/memcached_callback.c b/libmemcached/memcached_callback.c
index de792d0ecb5089ba3cb57994c22b20c9d053cd13..3433585cec331ed323e204bd48ce396f4f94a9a8 100644 (file)
--- a/libmemcached/memcached_callback.c
+++ b/libmemcached/memcached_callback.c
@@ -62,6 +62,7 @@ memcached_return memcached_callback_set(memcached_st *ptr,
       ptr->on_clone= func;
       break;
     }
+#ifdef MEMCACHED_ENABLE_DEPRECATED
   case MEMCACHED_CALLBACK_MALLOC_FUNCTION:
     {
       memcached_malloc_function func= *(memcached_malloc_function *)&data;
@@ -80,6 +81,7 @@ memcached_return memcached_callback_set(memcached_st *ptr,
       ptr->call_free= func;
       break;
     }
+#endif
   case MEMCACHED_CALLBACK_GET_FAILURE:
     {
       memcached_trigger_key func= *(memcached_trigger_key *)&data;
@@ -138,6 +140,7 @@ void *memcached_callback_get(memcached_st *ptr,
       *error= ptr->on_clone ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
       return *(void **)&ptr->on_clone;
     }
+#ifdef MEMCACHED_ENABLE_DEPRECATED
   case MEMCACHED_CALLBACK_MALLOC_FUNCTION:
     {
       *error= ptr->call_malloc ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
@@ -153,6 +156,7 @@ void *memcached_callback_get(memcached_st *ptr,
       *error= ptr->call_free ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
       return *(void **)&ptr->call_free;
     }
+#endif
   case MEMCACHED_CALLBACK_GET_FAILURE:
     {
       *error= ptr->get_key_failure ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;

diff --git a/libmemcached/memcached_constants.h b/libmemcached/memcached_constants.h
index 5fdede9a765923ddc6b428f7732078ca1ced2c24..5d0e31d0c3f352aa0d45f5d29b67bbd4e4503381 100644 (file)
--- a/libmemcached/memcached_constants.h
+++ b/libmemcached/memcached_constants.h
@@ -110,15 +110,17 @@ typedef enum {
 } memcached_behavior;
 
 typedef enum {
-  MEMCACHED_CALLBACK_PREFIX_KEY,
-  MEMCACHED_CALLBACK_USER_DATA,
-  MEMCACHED_CALLBACK_CLEANUP_FUNCTION,
-  MEMCACHED_CALLBACK_CLONE_FUNCTION,
-  MEMCACHED_CALLBACK_MALLOC_FUNCTION,
-  MEMCACHED_CALLBACK_REALLOC_FUNCTION,
-  MEMCACHED_CALLBACK_FREE_FUNCTION,
-  MEMCACHED_CALLBACK_GET_FAILURE,
-  MEMCACHED_CALLBACK_DELETE_TRIGGER
+  MEMCACHED_CALLBACK_PREFIX_KEY = 0,
+  MEMCACHED_CALLBACK_USER_DATA = 1,
+  MEMCACHED_CALLBACK_CLEANUP_FUNCTION = 2,
+  MEMCACHED_CALLBACK_CLONE_FUNCTION = 3,
+#ifdef MEMCACHED_ENABLE_DEPRECATED
+  MEMCACHED_CALLBACK_MALLOC_FUNCTION = 4,
+  MEMCACHED_CALLBACK_REALLOC_FUNCTION = 5,
+  MEMCACHED_CALLBACK_FREE_FUNCTION = 6,
+#endif
+  MEMCACHED_CALLBACK_GET_FAILURE = 7,
+  MEMCACHED_CALLBACK_DELETE_TRIGGER = 8
 } memcached_callback;
 
 typedef enum {

diff --git a/tests/function.c b/tests/function.c
index 5f83e1ea2a16a05d8f5133c189aff8a212fbe172..7dea597483f55ab8a9375f2ecfa58d91c53ff65f 100644 (file)
--- a/tests/function.c
+++ b/tests/function.c
@@ -3160,6 +3160,7 @@ static memcached_return set_prefix(memcached_st *memc)
   return MEMCACHED_SUCCESS;
 }
 
+#ifdef MEMCACHED_ENABLE_DEPRECATED
 static memcached_return deprecated_set_memory_alloc(memcached_st *memc)
 {
   void *test_ptr= NULL;
@@ -3204,6 +3205,7 @@ static memcached_return deprecated_set_memory_alloc(memcached_st *memc)
   }
   return MEMCACHED_SUCCESS;
 }
+#endif
 
 static memcached_return set_memory_alloc(memcached_st *memc)
 {
@@ -4536,7 +4538,9 @@ collection_st collection[] ={
   {"poll_timeout", poll_timeout, 0, tests},
   {"gets", enable_cas, 0, tests},
   {"consistent", enable_consistent, 0, tests},
+#ifdef MEMCACHED_ENABLE_DEPRECATED
   {"deprecated_memory_allocators", deprecated_set_memory_alloc, 0, tests},
+#endif
   {"memory_allocators", set_memory_alloc, 0, tests},
   {"prefix", set_prefix, 0, tests},
   {"version_1_2_3", check_for_1_2_3, 0, version_1_2_3},