--- a/src/server/plugins/postgresql/pgtest.c Mon Feb 10 17:44:51 2025 +0100 +++ b/src/server/plugins/postgresql/pgtest.c Sun Mar 02 18:10:52 2025 +0100 @@ -202,7 +202,7 @@ return NULL; } - CxMempool *mp = cxBasicMempoolCreate(64); + CxMempool *mp = cxMempoolCreateSimple(64); TestMultistatus *ms = cxMalloc(mp->allocator, sizeof(TestMultistatus)); ms->doc = doc; ms->mp = mp; @@ -227,7 +227,7 @@ void test_multistatus_destroy(TestMultistatus *ms) { if(!ms) return; xmlFreeDoc(ms->doc); - cxMempoolDestroy(ms->mp); + cxMempoolFree(ms->mp); } @@ -647,7 +647,7 @@ TestResponse *r1 = MAP_GET(ms->responses, "/propfind/"); UCX_TEST_ASSERT(r1, "propfind1: missing /propfind/ response"); - UCX_TEST_ASSERT(ms->responses->size == 1, "propfind1: wrong response count"); + UCX_TEST_ASSERT(cxMapSize(ms->responses) == 1, "propfind1: wrong response count"); TestProperty *p = MAP_GET(r1->properties, "DAV:resourcetype"); UCX_TEST_ASSERT(p, "propfind1: missing property 'resourcetype'"); @@ -679,7 +679,7 @@ r1 = MAP_GET(ms->responses, "/propfind/"); UCX_TEST_ASSERT(r1, "propfind2: missing /propfind/ response"); - UCX_TEST_ASSERT(ms->responses->size == 5, "propfind2: wrong response count"); + UCX_TEST_ASSERT(cxMapSize(ms->responses) == 5, "propfind2: wrong response count"); r1 = MAP_GET(ms->responses, "/propfind/res2"); UCX_TEST_ASSERT(r1, "propfind2: missing /propfind/res2 response"); @@ -713,7 +713,7 @@ r1 = MAP_GET(ms->responses, "/propfind/"); UCX_TEST_ASSERT(r1, "propfind3: missing /propfind/ response"); - UCX_TEST_ASSERT(ms->responses->size == 6, "propfind3: wrong response count"); + UCX_TEST_ASSERT(cxMapSize(ms->responses) == 6, "propfind3: wrong response count"); r1 = MAP_GET(ms->responses, "/propfind/res1"); @@ -775,7 +775,7 @@ r1 = MAP_GET(ms->responses, "/propfind/"); UCX_TEST_ASSERT(r1, "propfind1: missing /propfind/ response"); - UCX_TEST_ASSERT(ms->responses->size == 1, "propfind1: wrong response count"); + UCX_TEST_ASSERT(cxMapSize(ms->responses) == 1, "propfind1: wrong response count"); p = MAP_GET(r1->properties, "DAV:resourcetype"); UCX_TEST_ASSERT(r1, "propfind1: missing resourcetype property"); @@ -800,7 +800,7 @@ r1 = MAP_GET(ms->responses, "/propfind/"); UCX_TEST_ASSERT(r1, "propfind2: missing /propfind/ response"); - UCX_TEST_ASSERT(ms->responses->size == 5, "propfind2: wrong response count"); + UCX_TEST_ASSERT(cxMapSize(ms->responses) == 5, "propfind2: wrong response count"); r1 = MAP_GET(ms->responses, "/propfind/res1"); UCX_TEST_ASSERT(r1, "propfind2: missing /propfind/res1 response"); @@ -834,7 +834,7 @@ r1 = MAP_GET(ms->responses, "/propfind/"); UCX_TEST_ASSERT(r1, "propfind3: missing /propfind/ response"); - UCX_TEST_ASSERT(ms->responses->size == 6, "propfind3: wrong response count"); + UCX_TEST_ASSERT(cxMapSize(ms->responses) == 6, "propfind3: wrong response count"); r1 = MAP_GET(ms->responses, "/propfind/res1"); UCX_TEST_ASSERT(r1, "propfind3: missing /propfind/res1 response");