projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Incomming fixes from Charles on the replication branch.
[awesomized/libmemcached]
/
lib
/
memcached_behavior.c
diff --git
a/lib/memcached_behavior.c
b/lib/memcached_behavior.c
index 2a2ef5cd9bfc4eea4302cf9115ab1da2a53bdb10..910a99e6c22b3c0857db89477b5cb41e1baf8241 100644
(file)
--- a/
lib/memcached_behavior.c
+++ b/
lib/memcached_behavior.c
@@
-9,24
+9,17
@@
We quit all connections so we can reset the sockets.
*/
We quit all connections so we can reset the sockets.
*/
-void set_behavior_flag(memcached_st *ptr, memcached_flags temp_flag,
void *
data)
+void set_behavior_flag(memcached_st *ptr, memcached_flags temp_flag,
uint64_t
data)
{
{
- uint8_t truefalse;
-
if (data)
if (data)
- truefalse= *(unsigned int *)data;
- else
- truefalse= 0;
-
- if (truefalse)
ptr->flags|= temp_flag;
else
ptr->flags|= temp_flag;
else
- ptr->flags
+=
temp_flag;
+ ptr->flags
&= ~
temp_flag;
}
memcached_return memcached_behavior_set(memcached_st *ptr,
memcached_behavior flag,
}
memcached_return memcached_behavior_set(memcached_st *ptr,
memcached_behavior flag,
-
void *
data)
+
uint64_t
data)
{
switch (flag)
{
{
switch (flag)
{
@@
-55,10
+48,10
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
memcached_quit(ptr);
break;
case MEMCACHED_BEHAVIOR_DISTRIBUTION:
memcached_quit(ptr);
break;
case MEMCACHED_BEHAVIOR_DISTRIBUTION:
- ptr->distribution=
*(memcached_server_distribution *)(data)
;
+ ptr->distribution=
(memcached_server_distribution)data
;
break;
case MEMCACHED_BEHAVIOR_HASH:
break;
case MEMCACHED_BEHAVIOR_HASH:
- ptr->hash=
*(memcached_hash *
)(data);
+ ptr->hash=
(memcached_hash
)(data);
break;
case MEMCACHED_BEHAVIOR_CACHE_LOOKUPS:
set_behavior_flag(ptr, MEM_USE_CACHE_LOOKUPS, data);
break;
case MEMCACHED_BEHAVIOR_CACHE_LOOKUPS:
set_behavior_flag(ptr, MEM_USE_CACHE_LOOKUPS, data);
@@
-73,32
+66,29
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_SORT_HOSTS:
set_behavior_flag(ptr, MEM_USE_SORT_HOSTS, data);
break;
case MEMCACHED_BEHAVIOR_SORT_HOSTS:
set_behavior_flag(ptr, MEM_USE_SORT_HOSTS, data);
break;
- case MEMCACHED_BEHAVIOR_USER_DATA:
- ptr->user_data= data;
- break;
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
- int32_t timeout= (
*((int32_t *)data))
;
+ int32_t timeout= (
int32_t)data
;
ptr->poll_timeout= timeout;
break;
}
case MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT:
{
ptr->poll_timeout= timeout;
break;
}
case MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT:
{
- int32_t timeout= (
*((int32_t *)data))
;
+ int32_t timeout= (
int32_t)data
;
ptr->connect_timeout= timeout;
break;
}
case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
{
ptr->connect_timeout= timeout;
break;
}
case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
{
- ptr->send_size=
(*((int *)data))
;
+ ptr->send_size=
data
;
memcached_quit(ptr);
break;
}
case MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE:
{
memcached_quit(ptr);
break;
}
case MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE:
{
- ptr->recv_size=
(*((int *)data))
;
+ ptr->recv_size=
data
;
memcached_quit(ptr);
break;
}
memcached_quit(ptr);
break;
}
@@
-109,8
+99,8
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
-u
nsigned long long
memcached_behavior_get(memcached_st *ptr,
-
memcached_behavior flag)
+u
int64_t
memcached_behavior_get(memcached_st *ptr,
+ memcached_behavior flag)
{
memcached_flags temp_flag= 0;
{
memcached_flags temp_flag= 0;
@@
-146,8
+136,6
@@
unsigned long long memcached_behavior_get(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_SORT_HOSTS:
temp_flag= MEM_USE_SORT_HOSTS;
break;
case MEMCACHED_BEHAVIOR_SORT_HOSTS:
temp_flag= MEM_USE_SORT_HOSTS;
break;
- case MEMCACHED_BEHAVIOR_USER_DATA:
- return 0;
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
return (unsigned long long)ptr->poll_timeout;
case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
{
return (unsigned long long)ptr->poll_timeout;