X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstring.cc;h=b821aca61edcb1de951774d4a81b2ca1f75b19e5;hb=a83eb6704af40530cf38935cb30dd576af563e61;hp=268a437fbe91f6b984d53d4b5c93d6aee4de407a;hpb=983523c4536f12781533124cb8a00a4291b8cf79;p=awesomized%2Flibmemcached

diff --git a/libmemcached/string.cc b/libmemcached/string.cc
index 268a437f..b821aca6 100644
--- a/libmemcached/string.cc
+++ b/libmemcached/string.cc
@@ -79,7 +79,7 @@ static inline void _init_string(memcached_string_st *self)
   self->end= self->string= NULL;
 }
 
-memcached_string_st *memcached_string_create(memcached_st *memc, memcached_string_st *self, size_t initial_size)
+memcached_string_st *memcached_string_create(Memcached *memc, memcached_string_st *self, size_t initial_size)
 {
   WATCHPOINT_ASSERT(memc);
 
@@ -115,13 +115,25 @@ memcached_string_st *memcached_string_create(memcached_st *memc, memcached_strin
     return NULL;
   }
 
-  self->options.is_initialized= true;
+  memcached_set_initialized(self, true);
 
   WATCHPOINT_ASSERT(self->string == self->end);
 
   return self;
 }
 
+static memcached_return_t memcached_string_append_null(memcached_string_st& string)
+{
+  if (memcached_failed(_string_check(&string, 1)))
+  {
+    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+  }
+
+  *string.end= 0;
+
+  return MEMCACHED_SUCCESS;
+}
+
 static memcached_return_t memcached_string_append_null(memcached_string_st *string)
 {
   if (memcached_failed(_string_check(string, 1)))
@@ -186,6 +198,18 @@ char *memcached_string_c_copy(memcached_string_st *string)
   return c_ptr;
 }
 
+bool memcached_string_set(memcached_string_st& string, const char* value, size_t length)
+{
+  memcached_string_reset(&string);
+  if (memcached_success(memcached_string_append(&string, value, length)))
+  {
+    memcached_string_append_null(string);
+    return true;
+  }
+
+  return false;
+}
+
 void memcached_string_reset(memcached_string_st *string)
 {
   string->end= string->string;
@@ -255,17 +279,24 @@ const char *memcached_string_value(const memcached_string_st& self)
 
 char *memcached_string_take_value(memcached_string_st *self)
 {
+  char* value= NULL;
+
   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 (self)
   {
-    return memcached_string_c_copy(self);
+    if (memcached_string_length(self))
+    {
+      // If we fail at adding the null, we copy and move on
+      if (memcached_failed(memcached_string_append_null(self)))
+      {
+        return NULL;
+      }
+
+      value= self->string;
+      _init_string(self);
+    }
   }
 
-  char *value= self->string;
-
-  _init_string(self);
-
   return value;
 }