X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstring.h;h=01097a653edc1ee9563158fd256e5fd7266b5c93;hb=8c24eaae6772f7e27d6f638d3953d8c790068724;hp=29116ca5160faeaa1f6cabe283b4cd63ce198dad;hpb=b16fffff43d822239ce79a366ec36873b0803df9;p=m6w6%2Flibmemcached diff --git a/libmemcached/string.h b/libmemcached/string.h index 29116ca5..01097a65 100644 --- a/libmemcached/string.h +++ b/libmemcached/string.h @@ -60,14 +60,12 @@ struct memcached_string_st { } options; }; -#ifdef BUILDING_LIBMEMCACHED - #ifdef __cplusplus extern "C" { #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 @@ -97,6 +95,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 +char *memcached_string_take_value(memcached_string_st *self); + LIBMEMCACHED_LOCAL char *memcached_string_value_mutable(const memcached_string_st *self); @@ -106,15 +107,3 @@ void memcached_string_set_length(memcached_string_st *self, size_t length); #ifdef __cplusplus } #endif - -#ifdef __cplusplus -#define memcached_literal_param(X) (X), (static_cast((sizeof(X) - 1))) -#define memcached_string_make(X) (static_cast((sizeof(X) - 1))), (X) -#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