X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstring.cc;h=c7a47827decfae6ba6e0392c762864cc3ac86b55;hb=3dcd41c50068eec906a1a11a178e9b3f08ef2326;hp=4f012795e391377a532a4dcb8343187bac6b3449;hpb=67456d74f5bd4f354a360d70da503dc58cbe5971;p=m6w6%2Flibmemcached

diff --git a/libmemcached/string.cc b/libmemcached/string.cc
index 4f012795..c7a47827 100644
--- a/libmemcached/string.cc
+++ b/libmemcached/string.cc
@@ -43,24 +43,25 @@ 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;
 
     /* This is the block multiplier. To keep it larger and surive division errors we must round it up */
-    adjust= (need - (size_t)(string->current_size - (size_t)(string->end - string->string))) / MEMCACHED_BLOCK_SIZE;
+    size_t adjust= (need - (size_t)(string->current_size - (size_t)(string->end - string->string))) / MEMCACHED_BLOCK_SIZE;
     adjust++;
 
-    new_size= sizeof(char) * (size_t)((adjust * MEMCACHED_BLOCK_SIZE) + string->current_size);
+    size_t new_size= sizeof(char) * (size_t)((adjust * MEMCACHED_BLOCK_SIZE) + string->current_size);
     /* Test for overflow */
     if (new_size < need)
-      return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+    {
+      char error_message[1024];
+      int error_message_length= snprintf(error_message, sizeof(error_message),"Needed %ld, got %ld", (long)need, (long)new_size);
+      return memcached_set_error(*string->root, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, error_message, error_message_length);
+    }
 
-    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 (new_value == NULL)
     {
-      return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+      return memcached_set_error(*string->root, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
     }
 
     string->string= new_value;
@@ -78,10 +79,8 @@ static inline void _init_string(memcached_string_st *self)
   self->end= self->string= NULL;
 }
 
-memcached_string_st *memcached_string_create(const memcached_st *memc, memcached_string_st *self, size_t initial_size)
+memcached_string_st *memcached_string_create(memcached_st *memc, memcached_string_st *self, size_t initial_size)
 {
-  memcached_return_t rc;
-
   WATCHPOINT_ASSERT(memc);
 
   /* Saving malloc calls :) */
@@ -89,31 +88,29 @@ memcached_string_st *memcached_string_create(const memcached_st *memc, memcached
   {
     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= const_cast<memcached_st *>(memc);
+  self->root= memc;
 
   _init_string(self);
 
-  rc=  _string_check(self, initial_size);
-  if (rc != MEMCACHED_SUCCESS)
+  if (memcached_failed(_string_check(self, initial_size)))
   {
-    if (rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE)
+    if (memcached_is_allocated(self))
     {
-      memcached_set_errno(self->root, errno, NULL);
+      libmemcached_free(memc, self);
     }
-    libmemcached_free(memc, self);
 
     return NULL;
   }
@@ -125,16 +122,24 @@ memcached_string_st *memcached_string_create(const memcached_st *memc, memcached
   return self;
 }
 
-memcached_return_t memcached_string_append_character(memcached_string_st *string,
-                                                     char character)
+static memcached_return_t memcached_string_append_null(memcached_string_st *string)
 {
-  memcached_return_t rc;
+  if (memcached_failed(_string_check(string, 1)))
+  {
+    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+  }
 
-  rc=  _string_check(string, 1);
+  *string->end= 0;
 
-  if (rc != MEMCACHED_SUCCESS)
+  return MEMCACHED_SUCCESS;
+}
+
+memcached_return_t memcached_string_append_character(memcached_string_st *string,
+                                                     char character)
+{
+  if (memcached_failed(_string_check(string, 1)))
   {
-    return rc;
+    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
   }
 
   *string->end= character;
@@ -146,13 +151,9 @@ memcached_return_t memcached_string_append_character(memcached_string_st *string
 memcached_return_t memcached_string_append(memcached_string_st *string,
                                            const char *value, size_t length)
 {
-  memcached_return_t rc;
-
-  rc= _string_check(string, length);
-
-  if (rc != MEMCACHED_SUCCESS)
+  if (memcached_failed(_string_check(string, length)))
   {
-    return rc;
+    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
   }
 
   WATCHPOINT_ASSERT(length <= string->current_size);
@@ -167,14 +168,12 @@ memcached_return_t memcached_string_append(memcached_string_st *string,
 
 char *memcached_string_c_copy(memcached_string_st *string)
 {
-  char *c_ptr;
-
-  if (memcached_string_length(string) == 0)
+  if (not memcached_string_length(string))
     return NULL;
 
-  c_ptr= static_cast<char *>(libmemcached_malloc(string->root, (memcached_string_length(string)+1) * sizeof(char)));
+  char *c_ptr= static_cast<char *>(libmemcached_malloc(string->root, (memcached_string_length(string)+1) * sizeof(char)));
 
-  if (c_ptr == NULL)
+  if (not c_ptr)
     return NULL;
 
   memcpy(c_ptr, memcached_string_value(string), memcached_string_length(string));
@@ -192,8 +191,10 @@ memcached_return_t memcached_string_reset(memcached_string_st *string)
 
 void memcached_string_free(memcached_string_st *ptr)
 {
-  if (ptr == NULL)
+  if (not ptr)
+  {
     return;
+  }
 
   if (ptr->string)
   {
@@ -217,7 +218,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)
@@ -230,6 +231,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;