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_set_error(*string->root, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
+ {
+ 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 (not new_value)
+ if (new_value == NULL)
{
return memcached_set_error(*string->root, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
}
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);
}
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_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)))
char *memcached_string_c_copy(memcached_string_st *string)
{
- if (not memcached_string_length(string))
+ if (memcached_string_length(string) == 0)
+ {
return NULL;
+ }
char *c_ptr= static_cast<char *>(libmemcached_malloc(string->root, (memcached_string_length(string)+1) * sizeof(char)));
- if (not c_ptr)
+ 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)
+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;
+}
- return MEMCACHED_SUCCESS;
+void memcached_string_free(memcached_string_st& ptr)
+{
+ memcached_string_free(&ptr);
}
void memcached_string_free(memcached_string_st *ptr)
{
- if (not ptr)
+ if (ptr == NULL)
{
return;
}
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);
}
+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->current_size;
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)
{
+ 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;
}
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;
}