projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Bug #442914: 'delete noreply' may hang the client
[m6w6/libmemcached]
/
libmemcached
/
memcached_callback.c
diff --git
a/libmemcached/memcached_callback.c
b/libmemcached/memcached_callback.c
index de792d0ecb5089ba3cb57994c22b20c9d053cd13..ea59f84453749356ecd01de10190fedaf99234ea 100644
(file)
--- a/
libmemcached/memcached_callback.c
+++ b/
libmemcached/memcached_callback.c
@@
-21,7
+21,7
@@
memcached_return memcached_callback_set(memcached_st *ptr,
{
size_t key_length= strlen(key);
{
size_t key_length= strlen(key);
- if (memcached_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)
+ if (memcached_key_test((c
onst c
har **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)
{
return MEMCACHED_BAD_KEY_PROVIDED;
}
{
return MEMCACHED_BAD_KEY_PROVIDED;
}
@@
-62,6
+62,7
@@
memcached_return memcached_callback_set(memcached_st *ptr,
ptr->on_clone= func;
break;
}
ptr->on_clone= func;
break;
}
+#ifdef MEMCACHED_ENABLE_DEPRECATED
case MEMCACHED_CALLBACK_MALLOC_FUNCTION:
{
memcached_malloc_function func= *(memcached_malloc_function *)&data;
case MEMCACHED_CALLBACK_MALLOC_FUNCTION:
{
memcached_malloc_function func= *(memcached_malloc_function *)&data;
@@
-80,6
+81,7
@@
memcached_return memcached_callback_set(memcached_st *ptr,
ptr->call_free= func;
break;
}
ptr->call_free= func;
break;
}
+#endif
case MEMCACHED_CALLBACK_GET_FAILURE:
{
memcached_trigger_key func= *(memcached_trigger_key *)&data;
case MEMCACHED_CALLBACK_GET_FAILURE:
{
memcached_trigger_key func= *(memcached_trigger_key *)&data;
@@
-138,6
+140,7
@@
void *memcached_callback_get(memcached_st *ptr,
*error= ptr->on_clone ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;
return *(void **)&ptr->on_clone;
}
*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;
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;
}
*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;
case MEMCACHED_CALLBACK_GET_FAILURE:
{
*error= ptr->get_key_failure ? MEMCACHED_SUCCESS : MEMCACHED_FAILURE;