projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updates for CORK.
[m6w6/libmemcached]
/
libmemcached
/
callback.c
diff --git
a/libmemcached/callback.c
b/libmemcached/callback.c
index b0ddfc2ba0d394c311ba9c39f39c1703cc6a2d97..252b4334e66166b2985def805da973457a5b9ed3 100644
(file)
--- a/
libmemcached/callback.c
+++ b/
libmemcached/callback.c
@@
-9,17
+9,17
@@
*
*/
*
*/
-#include "common.h"
+#include "common.h"
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/tcp.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/tcp.h>
-/*
+/*
These functions provide data and function callback support
*/
These functions provide data and function callback support
*/
-memcached_return_t memcached_callback_set(memcached_st *ptr,
- memcached_callback_t flag,
+memcached_return_t memcached_callback_set(memcached_st *ptr,
+ const memcached_callback_t flag,
void *data)
{
switch (flag)
void *data)
{
switch (flag)
@@
-105,6
+105,7
@@
memcached_return_t memcached_callback_set(memcached_st *ptr,
ptr->delete_trigger= func;
break;
}
ptr->delete_trigger= func;
break;
}
+ case MEMCACHED_CALLBACK_MAX:
default:
return MEMCACHED_FAILURE;
}
default:
return MEMCACHED_FAILURE;
}
@@
-112,8
+113,8
@@
memcached_return_t memcached_callback_set(memcached_st *ptr,
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
-void *memcached_callback_get(memcached_st *ptr,
- memcached_callback_t flag,
+void *memcached_callback_get(memcached_st *ptr,
+
const
memcached_callback_t flag,
memcached_return_t *error)
{
memcached_return_t local_error;
memcached_return_t *error)
{
memcached_return_t local_error;
@@
-178,6
+179,7
@@
void *memcached_callback_get(memcached_st *ptr,
*error= ptr->delete_trigger ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
return *(void **)&ptr->delete_trigger;
}
*error= ptr->delete_trigger ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
return *(void **)&ptr->delete_trigger;
}
+ case MEMCACHED_CALLBACK_MAX:
default:
WATCHPOINT_ASSERT(0);
*error= MEMCACHED_FAILURE;
default:
WATCHPOINT_ASSERT(0);
*error= MEMCACHED_FAILURE;