projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Check for local memcached, and then add PWD
[m6w6/libmemcached]
/
libmemcached
/
namespace.cc
diff --git
a/libmemcached/namespace.cc
b/libmemcached/namespace.cc
index 5cefae56f47981427885265cb0dc93c6bd06f597..6a9ec2439d5e279e1734ed0c0bc8056ca06c9547 100644
(file)
--- a/
libmemcached/namespace.cc
+++ b/
libmemcached/namespace.cc
@@
-36,10
+36,11
@@
*/
#include <libmemcached/common.h>
*/
#include <libmemcached/common.h>
+#include <libmemcached/assert.hpp>
memcached_return_t memcached_set_namespace(memcached_st *self, const char *key, size_t key_length)
{
memcached_return_t memcached_set_namespace(memcached_st *self, const char *key, size_t key_length)
{
-
WATCHPOINT_ASSERT(self
);
+
assert_msg(self, "A NULL memcached_st was used"
);
if (key and key_length == 0)
{
if (key and key_length == 0)
{
@@
-58,7
+59,7
@@
memcached_return_t memcached_set_namespace(memcached_st *self, const char *key,
if (memcached_failed(memcached_key_test(*self, (const char **)&key, &key_length, 1)))
{
self->flags.verify_key= orig;
if (memcached_failed(memcached_key_test(*self, (const char **)&key, &key_length, 1)))
{
self->flags.verify_key= orig;
- return memcached_
set_error(*self, MEMCACHED_BAD_KEY_PROVIDED, MEMCACHED_AT
);
+ return memcached_
last_error(self
);
}
self->flags.verify_key= orig;
}
self->flags.verify_key= orig;
@@
-86,8
+87,10
@@
memcached_return_t memcached_set_namespace(memcached_st *self, const char *key,
const char * memcached_get_namespace(memcached_st *self)
{
const char * memcached_get_namespace(memcached_st *self)
{
- if (not self->_namespace)
+ if (self->_namespace == NULL)
+ {
return NULL;
return NULL;
+ }
return memcached_array_string(self->_namespace);
}
return memcached_array_string(self->_namespace);
}