Fix usage for using the macro for realloc.

[awesomized/libmemcached] / libmemcached / string.cc

diff --git a/libmemcached/string.cc b/libmemcached/string.cc
index 9e029627131392a6163761d5d01c8f2d4282688c..a94d442111da9abd37e8ed1fbba4cb0373b464a9 100644 (file)
--- a/libmemcached/string.cc
+++ b/libmemcached/string.cc
@@ -43,7 +43,6 @@ inline static memcached_return_t _string_check(memcached_string_st *string, size
   if (need && need > (size_t)(string->current_size - (size_t)(string->end - string->string)))
   {
     size_t current_offset= (size_t) (string->end - string->string);
-    char *new_value;
     size_t adjust;
     size_t new_size;
 
@@ -56,9 +55,9 @@ inline static memcached_return_t _string_check(memcached_string_st *string, size
     if (new_size < need)
       return memcached_set_error(*string->root, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
 
-    new_value= static_cast<char *>(libmemcached_realloc(string->root, string->string, new_size));
+    char *new_value= libmemcached_xrealloc(string->root, string->string, new_size, char);
 
-    if (not new_value)
+    if (new_value == NULL)
     {
       return memcached_set_error(*string->root, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
     }
@@ -87,18 +86,18 @@ memcached_string_st *memcached_string_create(memcached_st *memc, memcached_strin
   {
     WATCHPOINT_ASSERT(self->options.is_initialized == false);
 
-    self->options.is_allocated= false;
+    memcached_set_allocated(self, false);
   }
   else
   {
-    self= static_cast<memcached_string_st *>(libmemcached_malloc(memc, sizeof(memcached_string_st)));
+    self= libmemcached_xmalloc(memc, memcached_string_st);
 
     if (self == NULL)
     {
       return NULL;
     }
 
-    self->options.is_allocated= true;
+    memcached_set_allocated(self, true);
   }
   self->root= memc;
 
@@ -106,7 +105,10 @@ memcached_string_st *memcached_string_create(memcached_st *memc, memcached_strin
 
   if (memcached_failed(_string_check(self, initial_size)))
   {
-    libmemcached_free(memc, self);
+    if (memcached_is_allocated(self))
+    {
+      libmemcached_free(memc, self);
+    }
 
     return NULL;
   }
@@ -118,6 +120,18 @@ memcached_string_st *memcached_string_create(memcached_st *memc, memcached_strin
   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;
+}
+
 memcached_return_t memcached_string_append_character(memcached_string_st *string,
                                                      char character)
 {
@@ -176,7 +190,9 @@ memcached_return_t memcached_string_reset(memcached_string_st *string)
 void memcached_string_free(memcached_string_st *ptr)
 {
   if (not ptr)
+  {
     return;
+  }
 
   if (ptr->string)
   {
@@ -200,7 +216,7 @@ memcached_return_t memcached_string_check(memcached_string_st *string, size_t ne
 
 size_t memcached_string_length(const memcached_string_st *self)
 {
-  return (size_t)(self->end - self->string);
+  return size_t(self->end -self->string);
 }
 
 size_t memcached_string_size(const memcached_string_st *self)
@@ -213,6 +229,22 @@ const char *memcached_string_value(const memcached_string_st *self)
   return self->string;
 }
 
+char *memcached_string_take_value(memcached_string_st *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)))
+  {
+    return memcached_string_c_copy(self);
+  }
+
+  char *value= self->string;
+
+  _init_string(self);
+
+  return value;
+}
+
 char *memcached_string_value_mutable(const memcached_string_st *self)
 {
   return self->string;