projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Removing all remnants of const char * in the C++ interface and replacing
[m6w6/libmemcached]
/
libmemcached
/
memcached_behavior.c
diff --git
a/libmemcached/memcached_behavior.c
b/libmemcached/memcached_behavior.c
index fb201d4ed82c4f1f31233f1d8bd7ba279f91a3c8..aa80f8c209ba25090e014b8d75f282b8c5f787ab 100644
(file)
--- a/
libmemcached/memcached_behavior.c
+++ b/
libmemcached/memcached_behavior.c
@@
-24,6
+24,9
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
{
switch (flag)
{
{
switch (flag)
{
+ case MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS:
+ ptr->number_of_replicas= (uint32_t)data;
+ break;
case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
ptr->io_msg_watermark= (int32_t)data;
break;
case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
ptr->io_msg_watermark= (int32_t)data;
break;
@@
-157,6
+160,10
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS:
set_behavior_flag(ptr, MEM_AUTO_EJECT_HOSTS, data);
break;
case MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS:
set_behavior_flag(ptr, MEM_AUTO_EJECT_HOSTS, data);
break;
+ default:
+ /* Shouldn't get here */
+ WATCHPOINT_ASSERT(flag);
+ break;
}
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
@@
-165,10
+172,12
@@
memcached_return memcached_behavior_set(memcached_st *ptr,
uint64_t memcached_behavior_get(memcached_st *ptr,
memcached_behavior flag)
{
uint64_t memcached_behavior_get(memcached_st *ptr,
memcached_behavior flag)
{
- memcached_flags temp_flag=
0
;
+ memcached_flags temp_flag=
MEM_NO_BLOCK
;
switch (flag)
{
switch (flag)
{
+ case MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS:
+ return ptr->number_of_replicas;
case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
return ptr->io_msg_watermark;
case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
return ptr->io_msg_watermark;
case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
@@
-274,6
+283,9
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS:
temp_flag= MEM_AUTO_EJECT_HOSTS;
break;
case MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS:
temp_flag= MEM_AUTO_EJECT_HOSTS;
break;
+ default:
+ WATCHPOINT_ASSERT(flag);
+ break;
}
WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */
}
WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */