diff -r 1a7853a4257e -r 5dee29c7c530 src/server/ucx/mempool.c --- a/src/server/ucx/mempool.c Thu Feb 23 13:10:04 2012 +0100 +++ b/src/server/ucx/mempool.c Sat Feb 25 12:43:26 2012 +0100 @@ -50,7 +50,7 @@ } } -void *ucx_mempool_malloc(UcxMempool *pool, size_t n) { +void *ucx_mempool_malloc(UcxMempool *pool, size_t n) { ucx_memchunk *mem = (ucx_memchunk*)malloc(sizeof(ucx_destructor) + n); if (mem == NULL) return NULL; @@ -65,7 +65,7 @@ return &mem->c; } -void *ucx_mempool_calloc(UcxMempool *pool, size_t nelem, size_t elsize) { +void *ucx_mempool_calloc(UcxMempool *pool, size_t nelem, size_t elsize) { void *ptr = ucx_mempool_malloc(pool, nelem*elsize); if(ptr == NULL) { return NULL; @@ -74,7 +74,7 @@ return ptr; } -void *ucx_mempool_realloc(UcxMempool *pool, void *ptr, size_t n) { +void *ucx_mempool_realloc(UcxMempool *pool, void *ptr, size_t n) { void *mem = ((char*)ptr) - sizeof(ucx_destructor); char *newm = (char*) realloc(mem, n + sizeof(ucx_destructor)); if (newm == NULL) return NULL;