Fix for lp:860465

[awesomized/libmemcached] / libmemcached / string.h

diff --git a/libmemcached/string.h b/libmemcached/string.h
index 50ad98bbe3baf2ded7de6973bec153ca1051cc4b..01097a653edc1ee9563158fd256e5fd7266b5c93 100644 (file)
--- a/libmemcached/string.h
+++ b/libmemcached/string.h
@@ -37,6 +37,8 @@
 
 #pragma once
 
+#include <libmemcached/basic_string.h>
+
 /**
   Strings are always under our control so we make some assumptions
   about them.
@@ -58,23 +60,12 @@ struct memcached_string_st {
   } options;
 };
 
-struct memcached_string_t {
-  size_t size;
-  const char *c_str;
-};
-
-#define memcached_size(X) (X).size;
-#define memcached_c_str(X) (X).c_str;
-#define memcached_string_param(X) (X).c_str, (X).size
-
-#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
@@ -104,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);
 
@@ -113,15 +107,3 @@ void memcached_string_set_length(memcached_string_st *self, size_t length);
 #ifdef __cplusplus
 }
 #endif
-
-#ifdef __cplusplus
-#define memcached_string_with_size(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_string_with_size(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