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 trunk. Updates to manual/update to latest libtest.
[m6w6/libmemcached]
/
libmemcached
/
string.h
diff --git
a/libmemcached/string.h
b/libmemcached/string.h
index 29116ca5160faeaa1f6cabe283b4cd63ce198dad..3a3fdf530fd1add85d247bda40f8c86d46de0334 100644
(file)
--- a/
libmemcached/string.h
+++ b/
libmemcached/string.h
@@
-67,7
+67,7
@@
extern "C" {
#endif
LIBMEMCACHED_LOCAL
#endif
LIBMEMCACHED_LOCAL
-memcached_string_st *memcached_string_create(
const
memcached_st *ptr,
+memcached_string_st *memcached_string_create(memcached_st *ptr,
memcached_string_st *string,
size_t initial_size);
LIBMEMCACHED_LOCAL
memcached_string_st *string,
size_t initial_size);
LIBMEMCACHED_LOCAL
@@
-97,6
+97,9
@@
size_t memcached_string_size(const memcached_string_st *self);
LIBMEMCACHED_LOCAL
const char *memcached_string_value(const memcached_string_st *self);
LIBMEMCACHED_LOCAL
const char *memcached_string_value(const memcached_string_st *self);
+LIBMEMCACHED_LOCAL
+char *memcached_string_take_value(memcached_string_st *self);
+
LIBMEMCACHED_LOCAL
char *memcached_string_value_mutable(const memcached_string_st *self);
LIBMEMCACHED_LOCAL
char *memcached_string_value_mutable(const memcached_string_st *self);
@@
-109,10
+112,8
@@
void memcached_string_set_length(memcached_string_st *self, size_t length);
#ifdef __cplusplus
#define memcached_literal_param(X) (X), (static_cast<size_t>((sizeof(X) - 1)))
#ifdef __cplusplus
#define memcached_literal_param(X) (X), (static_cast<size_t>((sizeof(X) - 1)))
-#define memcached_string_make(X) (static_cast<size_t>((sizeof(X) - 1))), (X)
#else
#define memcached_literal_param(X) (X), ((size_t)((sizeof(X) - 1)))
#else
#define memcached_literal_param(X) (X), ((size_t)((sizeof(X) - 1)))
-#define memcached_string_make(X) (((size_t)((sizeof(X) - 1))), (X)
#endif
#define memcached_string_make_from_cstr(X) (X), ((X) ? strlen(X) : 0)
#endif
#define memcached_string_make_from_cstr(X) (X), ((X) ? strlen(X) : 0)