X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstring.c;h=464d55c0c9878bd2fea2eb5252a55f00ae2e9530;hb=a4456cc10079f2e6f648befc91657f2723c825e5;hp=33b9222a912418602beb5b969bcfdde21fadafa5;hpb=f1563c45b37bba7d51228af44dc184a9d0308e81;p=awesomized%2Flibmemcached

diff --git a/libmemcached/string.c b/libmemcached/string.c
index 33b9222a..464d55c0 100644
--- a/libmemcached/string.c
+++ b/libmemcached/string.c
@@ -29,7 +29,7 @@ inline static memcached_return_t _string_check(memcached_string_st *string, size
     if (new_size < need)
       return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
 
-    new_value= string->root->call_realloc(string->root, string->string, new_size);
+    new_value= libmemcached_realloc(string->root, string->string, new_size);
 
     if (new_value == NULL)
       return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
@@ -49,7 +49,7 @@ static inline void _init_string(memcached_string_st *self)
   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(const memcached_st *memc, memcached_string_st *self, size_t initial_size)
 {
   memcached_return_t rc;
 
@@ -64,7 +64,7 @@ memcached_string_st *memcached_string_create(memcached_st *memc, memcached_strin
   }
   else
   {
-    self= memc->call_malloc(memc, sizeof(memcached_string_st));
+    self= libmemcached_malloc(memc, sizeof(memcached_string_st));
 
     if (self == NULL)
     {
@@ -80,7 +80,7 @@ memcached_string_st *memcached_string_create(memcached_st *memc, memcached_strin
   rc=  _string_check(self, initial_size);
   if (rc != MEMCACHED_SUCCESS)
   {
-    memc->call_free(memc, self);
+    libmemcached_free(memc, self);
     return NULL;
   }
 
@@ -134,7 +134,7 @@ char *memcached_string_c_copy(memcached_string_st *string)
   if (memcached_string_length(string) == 0)
     return NULL;
 
-  c_ptr= string->root->call_malloc(string->root, (memcached_string_length(string)+1) * sizeof(char));
+  c_ptr= libmemcached_malloc(string->root, (memcached_string_length(string)+1) * sizeof(char));
 
   if (c_ptr == NULL)
     return NULL;
@@ -159,12 +159,12 @@ void memcached_string_free(memcached_string_st *ptr)
 
   if (ptr->string)
   {
-    ptr->root->call_free(ptr->root, ptr->string);
+    libmemcached_free(ptr->root, ptr->string);
   }
 
   if (memcached_is_allocated(ptr))
   {
-    ptr->root->call_free(ptr->root, ptr);
+    libmemcached_free(ptr->root, ptr);
   }
   else
   {