Style cleanup

[m6w6/libmemcached] / libmemcached / memcached_callback.c

diff --git a/libmemcached/memcached_callback.c b/libmemcached/memcached_callback.c
index de792d0ecb5089ba3cb57994c22b20c9d053cd13..618bedf42aac9e54cc94e44488229035c06506fd 100644 (file)
--- a/libmemcached/memcached_callback.c
+++ b/libmemcached/memcached_callback.c
@@ -7,9 +7,9 @@
   These functions provide data and function callback support
 */
 
-memcached_return memcached_callback_set(memcached_st *ptr, 
-                                        memcached_callback flag, 
-                                        void *data)
+memcached_return_t memcached_callback_set(memcached_st *ptr, 
+                                          memcached_callback_t flag, 
+                                          void *data)
 {
   switch (flag)
   {
@@ -21,7 +21,7 @@ memcached_return memcached_callback_set(memcached_st *ptr,
       {
         size_t key_length= strlen(key);
 
-        if (memcached_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)
+        if (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)
         {
           return MEMCACHED_BAD_KEY_PROVIDED;
         }
@@ -52,16 +52,17 @@ memcached_return memcached_callback_set(memcached_st *ptr,
     }
   case MEMCACHED_CALLBACK_CLEANUP_FUNCTION:
     {
-      memcached_cleanup_func func= *(memcached_cleanup_func *)&data;
+      memcached_cleanup_fn func= *(memcached_cleanup_fn *)&data;
       ptr->on_cleanup= func;
       break;
     }
   case MEMCACHED_CALLBACK_CLONE_FUNCTION:
     {
-      memcached_clone_func func= *(memcached_clone_func *)&data;
+      memcached_clone_fn func= *(memcached_clone_fn *)&data;
       ptr->on_clone= func;
       break;
     }
+#ifdef MEMCACHED_ENABLE_DEPRECATED
   case MEMCACHED_CALLBACK_MALLOC_FUNCTION:
     {
       memcached_malloc_function func= *(memcached_malloc_function *)&data;
@@ -80,15 +81,16 @@ 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;
+      memcached_trigger_key_fn func= *(memcached_trigger_key_fn *)&data;
       ptr->get_key_failure= func;
       break;
     }
   case MEMCACHED_CALLBACK_DELETE_TRIGGER:
     {
-      memcached_trigger_delete_key func= *(memcached_trigger_delete_key *)&data;
+      memcached_trigger_delete_key_fn func= *(memcached_trigger_delete_key_fn *)&data;
       ptr->delete_trigger= func;
       break;
     }
@@ -100,10 +102,10 @@ memcached_return memcached_callback_set(memcached_st *ptr,
 }
 
 void *memcached_callback_get(memcached_st *ptr, 
-                             memcached_callback flag,
-                             memcached_return *error)
+                             memcached_callback_t flag,
+                             memcached_return_t *error)
 {
-  memcached_return local_error;
+  memcached_return_t local_error;
 
   if (!error)
     error = &local_error;
@@ -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;
@@ -164,8 +168,8 @@ void *memcached_callback_get(memcached_st *ptr,
       return *(void **)&ptr->delete_trigger;
     }
   default:
-      WATCHPOINT_ASSERT(0);
-      *error= MEMCACHED_FAILURE;
-      return NULL;
+    WATCHPOINT_ASSERT(0);
+    *error= MEMCACHED_FAILURE;
+    return NULL;
   }
 }