X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemory.h;h=e59eabbea9c21412d2c892e906746f1e50d72374;hb=2b3d451111ae803853443a783c20510a734e92da;hp=65d06b8c77a2b8940485db8d43d7258513372933;hpb=fbe4a2e21817d0c106db22ab83aab053ccc89a05;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memory.h b/libmemcached/memory.h
index 65d06b8c..e59eabbe 100644
--- a/libmemcached/memory.h
+++ b/libmemcached/memory.h
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <libmemcached-1.0/struct/memcached.h>
+
 static inline void libmemcached_free(const memcached_st *self, void *mem)
 {
   if (self)
@@ -57,16 +59,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 +82,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)))