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;
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 :) */
{
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;
}
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;
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);
char *memcached_string_c_copy(memcached_string_st *string)
{
- char *c_ptr;
-
if (memcached_string_length(string) == 0)
+ {
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)
+ {
return NULL;
+ }
memcpy(c_ptr, memcached_string_value(string), memcached_string_length(string));
c_ptr[memcached_string_length(string)]= 0;
return c_ptr;
}
-memcached_return_t memcached_string_reset(memcached_string_st *string)
+void memcached_string_reset(memcached_string_st *string)
{
string->end= string->string;
+}
- return MEMCACHED_SUCCESS;
+void memcached_string_free(memcached_string_st& ptr)
+{
+ memcached_string_free(&ptr);
}
void memcached_string_free(memcached_string_st *ptr)
{
if (ptr == NULL)
+ {
return;
+ }
if (ptr->string)
{
return _string_check(string, need);
}
+bool memcached_string_resize(memcached_string_st& string, const size_t need)
+{
+ return memcached_success(_string_check(&string, need));
+}
+
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_length(const memcached_string_st& self)
+{
+ return size_t(self.end -self.string);
}
size_t memcached_string_size(const memcached_string_st *self)
return self->string;
}
+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;
}
+char *memcached_string_c_str(memcached_string_st& self)
+{
+ return self.string;
+}
+
void memcached_string_set_length(memcached_string_st *self, size_t length)
{
- self->end= self->string + length;
+ self->end= self->string +length;
+}
+
+void memcached_string_set_length(memcached_string_st& self, const size_t length)
+{
+ assert(self.current_size >= length);
+ size_t set_length= length;
+ if (self.current_size > length)
+ {
+ if (memcached_failed(_string_check(&self, length)))
+ {
+ set_length= self.current_size;
+ }
+ }
+ self.end= self.string +set_length;
}
projects / m6w6 / libmemcached / blobdiff