projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge of latest - callback commit needed
[m6w6/libmemcached]
/
lib
/
memcached_behavior.c
diff --git
a/lib/memcached_behavior.c
b/lib/memcached_behavior.c
index c54d93fcd4ba03d094e591431750be2f76c867f5..f7a89604fe0d3408fa0dd58661107d877b13f94b 100644
(file)
--- a/
lib/memcached_behavior.c
+++ b/
lib/memcached_behavior.c
@@
-49,9
+49,12
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_KETAMA:
set_behavior_flag(ptr, MEM_USE_KETAMA, data);
break;
case MEMCACHED_BEHAVIOR_KETAMA:
set_behavior_flag(ptr, MEM_USE_KETAMA, data);
break;
+ case MEMCACHED_BEHAVIOR_USER_DATA:
+ ptr->user_data= data;
+ break;
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
-
unsigned int timeout= (*((unsigned in
t *)data));
+
int32_t timeout= (*((int32_
t *)data));
ptr->poll_timeout= timeout;
break;
ptr->poll_timeout= timeout;
break;
@@
-104,6
+107,9
@@
unsigned long long memcached_behavior_get(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_KETAMA:
temp_flag= MEM_USE_KETAMA;
break;
case MEMCACHED_BEHAVIOR_KETAMA:
temp_flag= MEM_USE_KETAMA;
break;
+ case MEMCACHED_BEHAVIOR_USER_DATA:
+ return 0;
+ //return (unsigned long long)ptr->user_data;
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
return (unsigned long long)ptr->poll_timeout;
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
return (unsigned long long)ptr->poll_timeout;