1.1 --- a/src/basic_mempool.c Wed Aug 03 17:27:55 2022 +0200
1.2 +++ b/src/basic_mempool.c Mon Aug 08 17:12:00 2022 +0200
1.3 @@ -80,8 +80,7 @@
1.4 }
1.5 }
1.6
1.7 - cx_basic_mempool_memory *mem = cxMalloc(pool->allocator,
1.8 - sizeof(cx_destructor_func) + n);
1.9 + cx_basic_mempool_memory *mem = malloc(sizeof(cx_destructor_func) + n);
1.10 if (mem == NULL) {
1.11 return NULL;
1.12 }
1.13 @@ -119,8 +118,7 @@
1.14 struct cx_basic_mempool_s *pool = data;
1.15
1.16 char *mem = ((char *) ptr) - sizeof(cx_destructor_func);
1.17 - char *newm = (char *) cxRealloc(pool->allocator, mem,
1.18 - n + sizeof(cx_destructor_func));
1.19 + char *newm = (char *) realloc(mem, n + sizeof(cx_destructor_func));
1.20 if (newm == NULL) {
1.21 return NULL;
1.22 }
1.23 @@ -150,7 +148,7 @@
1.24 if (mem->destructor != NULL) {
1.25 mem->destructor(&(mem->c));
1.26 }
1.27 - cxFree(pool->allocator, mem);
1.28 + free(mem);
1.29 size_t last_index = pool->ndata - 1;
1.30 if (i != last_index) {
1.31 pool->data[i] = pool->data[last_index];
1.32 @@ -172,7 +170,7 @@
1.33 if (mem->destructor) {
1.34 mem->destructor(&(mem->c));
1.35 }
1.36 - cxFree(pool->allocator, mem);
1.37 + free(mem);
1.38 }
1.39 }
1.40 free(pool->data);
1.41 @@ -200,10 +198,7 @@
1.42 cx_basic_mempool_set_destr,
1.43 };
1.44
1.45 -CxMempool *cxBasicMempoolCreate(
1.46 - size_t capacity,
1.47 - CxAllocator *allocator
1.48 -) {
1.49 +CxMempool *cxBasicMempoolCreate(size_t capacity) {
1.50 size_t poolsize;
1.51 if (cx_szmul(capacity, sizeof(void *), &poolsize)) {
1.52 return NULL;
1.53 @@ -236,7 +231,6 @@
1.54
1.55 pool->ndata = 0;
1.56 pool->size = capacity;
1.57 - pool->allocator = allocator;
1.58
1.59 return (CxMempool *) pool;
1.60 }
