projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge trunk
[awesomized/libmemcached]
/
libmemcached
/
string.cc
diff --git
a/libmemcached/string.cc
b/libmemcached/string.cc
index 0e17484055c5e6356073b4458a07d1ce426f4cf1..7bc7fec0036e87c293d87b1ee8c31287af515472 100644
(file)
--- a/
libmemcached/string.cc
+++ b/
libmemcached/string.cc
@@
-37,7
+37,6
@@
#include <libmemcached/common.h>
#include <libmemcached/common.h>
-#include <cassert>
inline static memcached_return_t _string_check(memcached_string_st *string, size_t need)
{
inline static memcached_return_t _string_check(memcached_string_st *string, size_t need)
{
@@
-231,7
+230,7
@@
const char *memcached_string_value(const memcached_string_st *self)
char *memcached_string_take_value(memcached_string_st *self)
{
char *memcached_string_take_value(memcached_string_st *self)
{
- assert
(self
);
+ assert
_msg(self, "Invalid memcached_string_st"
);
// If we fail at adding the null, we copy and move on
if (memcached_success(memcached_string_append_null(self)))
{
// If we fail at adding the null, we copy and move on
if (memcached_success(memcached_string_append_null(self)))
{