Mercurial > hg > ucx / file diff

--- a/src/mempool.c	Thu May 15 16:02:54 2025 +0200
+++ b/src/mempool.c	Thu May 15 16:12:09 2025 +0200
@@ -105,7 +105,7 @@
 
     struct cx_mempool_memory_s *mem, *newm;
     mem = (struct cx_mempool_memory_s*)(((char *) ptr) - sizeof(cx_destructor_func));
-    newm = cxRealloc(cxDefaultAllocator, mem, n + sizeof(cx_destructor_func));
+    newm = cxReallocDefault(mem, n + sizeof(cx_destructor_func));
 
     if (newm == NULL) return NULL;
     if (mem != newm) {
@@ -136,7 +136,7 @@
             if (mem->destructor) {
                 mem->destructor(mem->c);
             }
-            cxFree(cxDefaultAllocator, mem);
+            cxFreeDefault(mem);
             size_t last_index = pool->size - 1;
             if (i != last_index) {
                 pool->data[i] = pool->data[last_index];
@@ -157,11 +157,11 @@
         if (mem->destructor) {
             mem->destructor(mem->c);
         }
-        cxFree(cxDefaultAllocator, mem);
+        cxFreeDefault(mem);
     }
-    cxFree(cxDefaultAllocator, pool->data);
-    cxFree(cxDefaultAllocator, (void*) pool->allocator);
-    cxFree(cxDefaultAllocator, pool);
+    cxFreeDefault(pool->data);
+    cxFreeDefault((void*) pool->allocator);
+    cxFreeDefault(pool);
 }
 
 void cxMempoolSetDestructor(
@@ -221,12 +221,12 @@
     }
 
     struct cx_mempool_s *pool =
-            cxMalloc(cxDefaultAllocator, sizeof(struct cx_mempool_s));
+            cxMallocDefault(sizeof(struct cx_mempool_s));
     if (pool == NULL) return NULL;
 
-    CxAllocator *provided_allocator = cxMalloc(cxDefaultAllocator, sizeof(CxAllocator));
+    CxAllocator *provided_allocator = cxMallocDefault(sizeof(CxAllocator));
     if (provided_allocator == NULL) { // LCOV_EXCL_START
-        cxFree(cxDefaultAllocator, pool);
+        cxFreeDefault(pool);
         return NULL;
     } // LCOV_EXCL_STOP
     provided_allocator->cl = &cx_mempool_allocator_class;
@@ -234,10 +234,10 @@
 
     pool->allocator = provided_allocator;
 
-    pool->data = cxMalloc(cxDefaultAllocator, poolsize);
+    pool->data = cxMallocDefault(poolsize);
     if (pool->data == NULL) { // LCOV_EXCL_START
-        cxFree(cxDefaultAllocator, provided_allocator);
-        cxFree(cxDefaultAllocator, pool);
+        cxFreeDefault(provided_allocator);
+        cxFreeDefault(pool);
         return NULL;
     } // LCOV_EXCL_STOP
 
@@ -249,7 +249,7 @@
 }
 
 static void cx_mempool_free_transferred_allocator(void *al) {
-    cxFree(cxDefaultAllocator, al);
+    cxFreeDefault(al);
 }
 
 int cxMempoolTransfer(
@@ -265,7 +265,7 @@
     }
 
     // allocate a replacement allocator for the source pool
-    CxAllocator *new_source_allocator = cxMalloc(cxDefaultAllocator, sizeof(CxAllocator));
+    CxAllocator *new_source_allocator = cxMallocDefault(sizeof(CxAllocator));
     if (new_source_allocator == NULL) { // LCOV_EXCL_START
         return 1;
     } // LCOV_EXCL_STOP