projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Kevin's patch bug13
[m6w6/libmemcached]
/
lib
/
memcached_callback.c
diff --git
a/lib/memcached_callback.c
b/lib/memcached_callback.c
index 5348183cf89e134d17d1f7daeb2d8991a9087c88..95d6a384836666c2c15e2d52250f02ac73221a27 100644
(file)
--- 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:
{
}
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:
{
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;
}
ptr->on_clone= func;
break;
}
@@
-59,6
+59,10
@@
void *memcached_callback_get(memcached_st *ptr,
memcached_callback flag,
memcached_return *error)
{
memcached_callback flag,
memcached_return *error)
{
+ memcached_return local_error;
+ if (!error)
+ error = &local_error;
+
switch (flag)
{
case MEMCACHED_CALLBACK_USER_DATA:
switch (flag)
{
case MEMCACHED_CALLBACK_USER_DATA: