X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Fstring.cc;h=a94d442111da9abd37e8ed1fbba4cb0373b464a9;hb=2b3d451111ae803853443a783c20510a734e92da;hp=d482d4cd4d21630feac0412b5d927ffcb8645a01;hpb=7b7b8c93445a962375b17f1b22d1fb1b1f693484;p=awesomized%2Flibmemcached

diff --git a/libmemcached/string.cc b/libmemcached/string.cc
index d482d4cd..a94d4421 100644
--- a/libmemcached/string.cc
+++ b/libmemcached/string.cc
@@ -43,7 +43,6 @@ 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;
 
@@ -56,9 +55,9 @@ inline static memcached_return_t _string_check(memcached_string_st *string, size
     if (new_size < need)
       return memcached_set_error(*string->root, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
 
-    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);
     }
@@ -91,7 +90,7 @@ memcached_string_st *memcached_string_create(memcached_st *memc, memcached_strin
   }
   else
   {
-    self= static_cast<memcached_string_st *>(libmemcached_malloc(memc, sizeof(memcached_string_st)));
+    self= libmemcached_xmalloc(memc, memcached_string_st);
 
     if (self == NULL)
     {