memcached_return memcached_string_check(memcached_string_st *string, size_t need)
{
- if (need > (size_t)(string->current_size - (size_t)(string->end - string->string)))
+ if (need && need > (size_t)(string->current_size - (size_t)(string->end - string->string)))
{
size_t current_offset= string->end - string->string;
char *new_value;
return MEMCACHED_SUCCESS;
}
-memcached_string_st *memcached_string_create(memcached_st *ptr, size_t initial_size)
+memcached_string_st *memcached_string_create(memcached_st *ptr, memcached_string_st *string, size_t initial_size)
{
memcached_return rc;
- memcached_string_st *string;
/* Saving malloc calls :) */
- string= (memcached_string_st *)malloc(sizeof(memcached_string_st));
- if (!string)
- return NULL;
- string->end= string->string;
- memset(string, 0, sizeof(memcached_string_st));
- string->block_size= initial_size;
+ if (string)
+ {
+ memset(string, 0, sizeof(memcached_string_st));
+ string->is_allocated= MEMCACHED_NOT_ALLOCATED;
+ }
+ else
+ {
+ string= (memcached_string_st *)malloc(sizeof(memcached_string_st));
+ if (!string)
+ return NULL;
+ memset(string, 0, sizeof(memcached_string_st));
+ string->is_allocated= MEMCACHED_ALLOCATED;
+ }
+ string->block_size= MEMCACHED_BLOCK_SIZE;
+ string->root= ptr;
rc= memcached_string_check(string, initial_size);
if (rc != MEMCACHED_SUCCESS)
return string;
}
-memcached_return memcached_string_append_character(memcached_st *ptr,
- memcached_string_st *string,
+memcached_return memcached_string_append_character(memcached_string_st *string,
char character)
{
memcached_return rc;
return MEMCACHED_SUCCESS;
}
-memcached_return memcached_string_append(memcached_st *ptr, memcached_string_st *string,
+memcached_return memcached_string_append(memcached_string_st *string,
char *value, size_t length)
{
memcached_return rc;
return MEMCACHED_SUCCESS;
}
-size_t memcached_string_backspace(memcached_st *ptr, memcached_string_st *string, size_t remove)
+size_t memcached_string_backspace(memcached_string_st *string, size_t remove)
{
if (string->end - string->string > remove)
{
return remove;
}
-memcached_return memcached_string_reset(memcached_st *ptr, memcached_string_st *string)
+char *memcached_string_c_copy(memcached_string_st *string)
+{
+ char *c_ptr;
+ c_ptr= (char *)malloc(memcached_string_length(string) * sizeof(char));
+ if (!c_ptr)
+ return NULL;
+
+ memcpy(c_ptr, memcached_string_value(string), memcached_string_length(string));
+
+ return c_ptr;
+}
+
+memcached_return memcached_string_reset(memcached_string_st *string)
{
string->end= string->string;
return MEMCACHED_SUCCESS;
}
-void memcached_string_free(memcached_st *ptr, memcached_string_st *string)
+void memcached_string_free(memcached_string_st *string)
{
- free(string->string);
- free(string);
+ if (string->string)
+ free(string->string);
+ if (string->is_allocated == MEMCACHED_ALLOCATED)
+ free(string);
}