X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_callback.c;h=95d6a384836666c2c15e2d52250f02ac73221a27;hb=69b905e54a2f5ad5038a3f75c269bbbb4c3e610f;hp=5348183cf89e134d17d1f7daeb2d8991a9087c88;hpb=89eed63d9bf97065589679c45a3095088c4bb150;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_callback.c b/lib/memcached_callback.c
index 5348183c..95d6a384 100644
--- a/lib/memcached_callback.c
+++ b/lib/memcached_callback.c
@@ -20,13 +20,13 @@ memcached_return memcached_callback_set(memcached_st *ptr,
     }
   case MEMCACHED_CALLBACK_CLEANUP_FUNCTION:
     {
-      cleanup_func func= (cleanup_func)data;
+      memcached_cleanup_func func= (memcached_cleanup_func)data;
       ptr->on_cleanup= func;
       break;
     }
   case MEMCACHED_CALLBACK_CLONE_FUNCTION:
     {
-      clone_func func= (clone_func)data;
+      memcached_clone_func func= (memcached_clone_func)data;
       ptr->on_clone= func;
       break;
     }
@@ -59,6 +59,10 @@ void *memcached_callback_get(memcached_st *ptr,
                              memcached_callback flag,
                              memcached_return *error)
 {
+  memcached_return local_error;
+  if (!error)
+    error = &local_error;
+
   switch (flag)
   {
   case MEMCACHED_CALLBACK_USER_DATA: