X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemory.h;fp=libmemcached%2Fmemory.h;h=89ad6984b70ce6b39fe93a44dc15da04fffbbc12;hb=f34725871a4ad46ea3b3194d829eebf81cc5c08e;hp=65d06b8c77a2b8940485db8d43d7258513372933;hpb=d4f9faac5b2532375157aac90c36ace0261c867e;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memory.h b/libmemcached/memory.h
index 65d06b8c..89ad6984 100644
--- a/libmemcached/memory.h
+++ b/libmemcached/memory.h
@@ -57,16 +57,19 @@ static inline void *libmemcached_malloc(const memcached_st *self, const size_t s
 
   return malloc(size);
 }
+#define libmemcached_xmalloc(__memcachd_st, __type) ((__type *)libmemcached_malloc((__memcachd_st), sizeof(__type)))
 
-static inline void *libmemcached_realloc(const memcached_st *self, void *mem, const size_t size)
+static inline void *libmemcached_realloc(const memcached_st *self, void *mem, size_t nmemb,  const size_t size)
 {
   if (self)
   {
-    return self->allocators.realloc(self, mem, size, self->allocators.context);
+    return self->allocators.realloc(self, mem, nmemb * size, self->allocators.context);
   }
 
   return realloc(mem, size);
 }
+#define libmemcached_xrealloc(__memcachd_st, __mem, __nelem, __type) ((__type *)libmemcached_realloc((__memcachd_st), (__mem), (__nelem), sizeof(__type)))
+#define libmemcached_xvalloc(__memcachd_st, __nelem, __type) ((__type *)libmemcached_realloc((__memcachd_st), NULL, (__nelem), sizeof(__type)))
 
 static inline void *libmemcached_calloc(const memcached_st *self, size_t nelem, size_t size)
 {
@@ -77,3 +80,4 @@ static inline void *libmemcached_calloc(const memcached_st *self, size_t nelem,
 
   return calloc(nelem, size);
 }
+#define libmemcached_xcalloc(__memcachd_st, __nelem, __type) ((__type *)libmemcached_calloc((__memcachd_st), (__nelem), sizeof(__type)))