diff -r f83583a0bbac -r f0f99dd06d9f src/basic_mempool.c --- a/src/basic_mempool.c Wed Aug 03 17:27:55 2022 +0200 +++ b/src/basic_mempool.c Mon Aug 08 17:12:00 2022 +0200 @@ -80,8 +80,7 @@ } } - cx_basic_mempool_memory *mem = cxMalloc(pool->allocator, - sizeof(cx_destructor_func) + n); + cx_basic_mempool_memory *mem = malloc(sizeof(cx_destructor_func) + n); if (mem == NULL) { return NULL; } @@ -119,8 +118,7 @@ struct cx_basic_mempool_s *pool = data; char *mem = ((char *) ptr) - sizeof(cx_destructor_func); - char *newm = (char *) cxRealloc(pool->allocator, mem, - n + sizeof(cx_destructor_func)); + char *newm = (char *) realloc(mem, n + sizeof(cx_destructor_func)); if (newm == NULL) { return NULL; } @@ -150,7 +148,7 @@ if (mem->destructor != NULL) { mem->destructor(&(mem->c)); } - cxFree(pool->allocator, mem); + free(mem); size_t last_index = pool->ndata - 1; if (i != last_index) { pool->data[i] = pool->data[last_index]; @@ -172,7 +170,7 @@ if (mem->destructor) { mem->destructor(&(mem->c)); } - cxFree(pool->allocator, mem); + free(mem); } } free(pool->data); @@ -200,10 +198,7 @@ cx_basic_mempool_set_destr, }; -CxMempool *cxBasicMempoolCreate( - size_t capacity, - CxAllocator *allocator -) { +CxMempool *cxBasicMempoolCreate(size_t capacity) { size_t poolsize; if (cx_szmul(capacity, sizeof(void *), &poolsize)) { return NULL; @@ -236,7 +231,6 @@ pool->ndata = 0; pool->size = capacity; - pool->allocator = allocator; return (CxMempool *) pool; }