Mercurial > hg > webserver / file diff

--- a/src/server/test/webdav.c	Wed Nov 02 19:19:01 2022 +0100
+++ b/src/server/test/webdav.c	Sun Nov 06 15:53:32 2022 +0100
@@ -312,7 +312,7 @@
     // for adding resources to the response
     WebdavResponse *response = (WebdavResponse*)ms;
     
-    UcxList *requests = NULL;
+    WebdavPropfindRequestList *requests = NULL;
     
     // Initialize all Webdav Backends
     if(webdav_propfind_init(&backend1, propfind, "/", "/", &requests)) {
@@ -703,11 +703,12 @@
     rq = testutil_request(sn->pool, "PUT", "/");
     testutil_request_body(sn, rq, "Hello World!", 12);
     
-    UcxBuffer *b1 = rqbody2buffer(sn, rq);
-    UCX_TEST_ASSERT(b1->size == 12, "b1: wrong size");
-    UCX_TEST_ASSERT(!memcmp(b1->space,"Hello World!",12), "b1: wrong content");
+    CxBuffer b1;
+    rqbody2buffer(sn, rq, &b1);
+    UCX_TEST_ASSERT(b1.size == 12, "b1: wrong size");
+    UCX_TEST_ASSERT(!memcmp(b1.space,"Hello World!",12), "b1: wrong content");
     
-    ucx_buffer_free(b1);
+    cxBufferDestroy(&b1);
     testutil_destroy_session(sn);
     
     //
@@ -721,11 +722,12 @@
     rq = testutil_request(sn->pool, "PUT", "/");
     testutil_request_body(sn, rq, (char*)body1, len1);
     
-    UcxBuffer *b2 = rqbody2buffer(sn, rq);
-    UCX_TEST_ASSERT(b2->size == len1, "b2: wrong size");
-    UCX_TEST_ASSERT(!memcmp(b2->space, body1, len1), "b2: wrong content");
+    CxBuffer b2;
+    rqbody2buffer(sn, rq, &b2);
+    UCX_TEST_ASSERT(b2.size == len1, "b2: wrong size");
+    UCX_TEST_ASSERT(!memcmp(b2.space, body1, len1), "b2: wrong content");
     
-    ucx_buffer_free(b2);
+    cxBufferDestroy(&b2);
     testutil_destroy_session(sn);
     
     UCX_TEST_END;
@@ -997,15 +999,15 @@
     UCX_TEST_BEGIN;
     UCX_TEST_ASSERT(!test_init(&sn, &rq, &propfind, TEST_PROPFIND1), "init failed");
     
-    UcxList *requests = NULL;
+    WebdavPropfindRequestList *requests = NULL;
     int err = webdav_propfind_init(&backend1, propfind, "/", "/", &requests);
     
     UCX_TEST_ASSERT(!err, "webdav_propfind_init failed");
     UCX_TEST_ASSERT(requests, "request list is empty");
-    UCX_TEST_ASSERT(ucx_list_size(requests), "request list has wrong size");
+    UCX_TEST_ASSERT(cx_linked_list_size(requests, offsetof(WebdavPropfindRequestList, next)), "request list has wrong size");
     
-    WebdavPropfindRequest *p1 = requests->data;
-    WebdavPropfindRequest *p2 = requests->next->data;
+    WebdavPropfindRequest *p1 = requests->propfind;
+    WebdavPropfindRequest *p2 = requests->next->propfind;
     
     // backend1 removes the first property from the plist
     // backend2 should have one property less