projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in pid/ping status.
[m6w6/libmemcached]
/
libmemcached
/
behavior.cc
diff --git
a/libmemcached/behavior.cc
b/libmemcached/behavior.cc
index 6546efbaf5273b4d189a3b18f7ba8e3894f04ae6..0c182ec2e2f07036096cec7e350254723a28e512 100644
(file)
--- a/
libmemcached/behavior.cc
+++ b/
libmemcached/behavior.cc
@@
-36,6
+36,7
@@
*/
#include <libmemcached/common.h>
*/
#include <libmemcached/common.h>
+#include <libmemcached/options.hpp>
#include <libmemcached/virtual_bucket.h>
#include <ctime>
#include <libmemcached/virtual_bucket.h>
#include <ctime>
@@
-211,7
+212,7
@@
memcached_return_t memcached_behavior_set(memcached_st *ptr,
memcached_literal_param("MEMCACHED_BEHAVIOR_USER_DATA deprecated."));
case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
memcached_literal_param("MEMCACHED_BEHAVIOR_USER_DATA deprecated."));
case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
- ptr->flags.hash_with_
prefix_key
= bool(data);
+ ptr->flags.hash_with_
namespace
= bool(data);
break;
case MEMCACHED_BEHAVIOR_NOREPLY:
break;
case MEMCACHED_BEHAVIOR_NOREPLY:
@@
-254,6
+255,11
@@
bool _is_auto_eject_host(const memcached_st *ptr)
uint64_t memcached_behavior_get(memcached_st *ptr,
const memcached_behavior_t flag)
{
uint64_t memcached_behavior_get(memcached_st *ptr,
const memcached_behavior_t flag)
{
+ if (not ptr)
+ {
+ return MEMCACHED_INVALID_ARGUMENTS;
+ }
+
switch (flag)
{
case MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS:
switch (flag)
{
case MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS:
@@
-409,7
+415,7
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
return 0;
case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
return 0;
case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
- return ptr->flags.hash_with_
prefix_key
;
+ return ptr->flags.hash_with_
namespace
;
case MEMCACHED_BEHAVIOR_NOREPLY:
return ptr->flags.no_reply;
case MEMCACHED_BEHAVIOR_NOREPLY:
return ptr->flags.no_reply;