diff -r bf3695fee719 -r 481802342fdf libidav/methods.c
--- a/libidav/methods.c	Mon Feb 04 14:11:57 2019 +0100
+++ b/libidav/methods.c	Mon Feb 04 17:17:48 2019 +0100
@@ -755,7 +755,7 @@
 
 UcxBuffer* create_proppatch_request(DavResourceData *data) {
     UcxBuffer *buf = ucx_buffer_new(NULL, 512, UCX_BUFFER_AUTOEXTEND);
-    sstr_t s;
+    scstr_t s;
     
     UcxMap *namespaces = ucx_map_new(8);
     char prefix[8];
@@ -775,32 +775,32 @@
         }
     }
     
-    s = S("<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n");
+    s = SC("<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n");
     ucx_buffer_write(s.ptr, 1, s.length, buf);
     
     // write root element and namespaces
-    s = S("<D:propertyupdate xmlns:D=\"DAV:\"");
+    s = SC("<D:propertyupdate xmlns:D=\"DAV:\"");
     ucx_buffer_write(s.ptr, 1, s.length, buf);
     UcxMapIterator mapi = ucx_map_iterator(namespaces);
     UcxKey key;
     char *pfxval;
     UCX_MAP_FOREACH(key, pfxval, mapi) {
-        s = S(" xmlns:");
+        s = SC(" xmlns:");
         ucx_buffer_write(s.ptr, 1, s.length, buf);
-        s = sstr(pfxval);
+        s = scstr(pfxval);
         ucx_buffer_write(s.ptr, 1, s.length, buf);
-        s = S("=\"");
+        s = SC("=\"");
         ucx_buffer_write(s.ptr, 1, s.length, buf);
-        s = sstrn(key.data, key.len);
+        s = scstrn(key.data, key.len);
         ucx_buffer_write(s.ptr, 1, s.length, buf);
-        s = S("\"");
+        s = SC("\"");
         ucx_buffer_write(s.ptr, 1, s.length, buf);
     }
-    s = S(">\n");
+    s = SC(">\n");
     ucx_buffer_write(s.ptr, 1, s.length, buf);
     
     if(data->set) {
-        s = S("<D:set>\n<D:prop>\n");
+        s = SC("<D:set>\n<D:prop>\n");
         ucx_buffer_write(s.ptr, 1, s.length, buf);
         UCX_FOREACH(elm, data->set) {
             DavProperty *property = elm->data;
@@ -810,15 +810,15 @@
             }
             
             // begin tag
-            s = S("<");
+            s = SC("<");
             ucx_buffer_write(s.ptr, 1, s.length, buf);
-            s = sstr(prefix);
+            s = scstr(prefix);
             ucx_buffer_write(s.ptr, 1, s.length, buf);
-            s = S(":");
+            s = SC(":");
             ucx_buffer_write(s.ptr, 1, s.length, buf);
-            s = sstr(property->name);
+            s = scstr(property->name);
             ucx_buffer_write(s.ptr, 1, s.length, buf);
-            s = S(">");
+            s = SC(">");
             ucx_buffer_write(s.ptr, 1, s.length, buf);
             
             // content
@@ -830,43 +830,43 @@
             }
             
             // end tag
-            s = S("</");
+            s = SC("</");
             ucx_buffer_write(s.ptr, 1, s.length, buf);
-            s = sstr(prefix);
+            s = scstr(prefix);
             ucx_buffer_write(s.ptr, 1, s.length, buf);
-            s = S(":");
+            s = SC(":");
             ucx_buffer_write(s.ptr, 1, s.length, buf);
-            s = sstr(property->name);
+            s = scstr(property->name);
             ucx_buffer_write(s.ptr, 1, s.length, buf);
-            s = S(">\n");
+            s = SC(">\n");
             ucx_buffer_write(s.ptr, 1, s.length, buf);
         }
-        s = S("</D:prop>\n</D:set>\n");
+        s = SC("</D:prop>\n</D:set>\n");
         ucx_buffer_write(s.ptr, 1, s.length, buf);
     }
     if(data->remove) {
-        s = S("<D:remove>\n<D:prop>\n");
+        s = SC("<D:remove>\n<D:prop>\n");
         ucx_buffer_write(s.ptr, 1, s.length, buf);
         UCX_FOREACH(elm, data->remove) {
             DavProperty *property = elm->data;
             char *prefix = ucx_map_cstr_get(namespaces, property->ns->name);
             
-            s = S("<");
+            s = SC("<");
             ucx_buffer_write(s.ptr, 1, s.length, buf);
-            s = sstr(prefix);
+            s = scstr(prefix);
             ucx_buffer_write(s.ptr, 1, s.length, buf);
-            s = S(":");
+            s = SC(":");
             ucx_buffer_write(s.ptr, 1, s.length, buf);
-            s = sstr(property->name);
+            s = scstr(property->name);
             ucx_buffer_write(s.ptr, 1, s.length, buf);
-            s = S(" />\n");
+            s = SC(" />\n");
             ucx_buffer_write(s.ptr, 1, s.length, buf);
         }
-        s = S("</D:prop>\n</D:remove>\n");
+        s = SC("</D:prop>\n</D:remove>\n");
         ucx_buffer_write(s.ptr, 1, s.length, buf);
     }
     
-    s = S("</D:propertyupdate>\n");
+    s = SC("</D:propertyupdate>\n");
     ucx_buffer_write(s.ptr, 1, s.length, buf);
     
     // cleanup namespace map
@@ -876,7 +876,7 @@
     return buf;
 }
 
-UcxBuffer* create_crypto_proppatch_request(DavSession *sn, DavKey *key, char *name, char *hash) {
+UcxBuffer* create_crypto_proppatch_request(DavSession *sn, DavKey *key, const char *name, const char *hash) {
     UcxBuffer *buf = ucx_buffer_new(NULL, 512, UCX_BUFFER_AUTOEXTEND);
     sstr_t s;