projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Pulling in Mark's fixes for memory leaks in memslap
[m6w6/libmemcached]
/
libmemcached
/
memcached_callback.c
diff --git
a/libmemcached/memcached_callback.c
b/libmemcached/memcached_callback.c
index ad21c10d500422289f9ac427b8bfb4b88268f622..6db2db82d3dbe1e86329f33157ecdca339370bb6 100644
(file)
--- a/
libmemcached/memcached_callback.c
+++ b/
libmemcached/memcached_callback.c
@@
-54,6
+54,12
@@
memcached_return memcached_callback_set(memcached_st *ptr,
ptr->get_key_failure= func;
break;
}
ptr->get_key_failure= func;
break;
}
+ case MEMCACHED_CALLBACK_DELETE_TRIGGER:
+ {
+ memcached_trigger_delete_key func= (memcached_trigger_delete_key)data;
+ ptr->delete_trigger= func;
+ break;
+ }
default:
return MEMCACHED_FAILURE;
}
default:
return MEMCACHED_FAILURE;
}
@@
-106,6
+112,11
@@
void *memcached_callback_get(memcached_st *ptr,
*error= ptr->get_key_failure ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
return (void *)ptr->get_key_failure;
}
*error= ptr->get_key_failure ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
return (void *)ptr->get_key_failure;
}
+ case MEMCACHED_CALLBACK_DELETE_TRIGGER:
+ {
+ *error= ptr->delete_trigger ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
+ return (void *)ptr->delete_trigger;
+ }
default:
WATCHPOINT_ASSERT(0);
*error= MEMCACHED_FAILURE;
default:
WATCHPOINT_ASSERT(0);
*error= MEMCACHED_FAILURE;