diff -r 279f343bbf6c -r fac51f87def0 src/server/webdav/webdav.c --- a/src/server/webdav/webdav.c Wed Jul 31 13:02:06 2013 +0200 +++ b/src/server/webdav/webdav.c Sun Sep 08 23:27:07 2013 +0200 @@ -31,7 +31,8 @@ #include #include "webdav.h" -#include "../ucx/string.h" +#include +#include #include "../util/pool.h" #include "../util/pblock.h" #include "../util/date.h" @@ -541,7 +542,7 @@ int error) { // TODO: different errors - davrq->notFoundProps = ucx_dlist_append(davrq->notFoundProps, prop); + davrq->notFoundProps = ucx_list_append(davrq->notFoundProps, prop); } @@ -712,7 +713,7 @@ void xmlelm_add_child(XmlElement *parent, XmlElement *child) { if(parent->ctlen == 0) { - parent->content = ucx_dlist_append(parent->content, child); + parent->content = ucx_list_append(parent->content, child); } } @@ -728,7 +729,7 @@ sbuf_append(out, sstrn(" />", 3)); } else { sbuf_append(out, sstrn(">", 1)); - DAV_FOREACH(pr, (UcxDlist*)elm->content) { + DAV_FOREACH(pr, (UcxList*)elm->content) { xmlelm_write((XmlElement*)pr->data, out, 1); } sbuf_append(out, sstrn("okprop = ucx_dlist_append(propstat->okprop, prop); + propstat->okprop = ucx_list_append(propstat->okprop, prop); } else { UcxKey key; key.data = &status; key.len = sizeof(int); - UcxDlist *list = ucx_map_get(propstat->map, key); - list = ucx_dlist_append(list, prop); + UcxList *list = ucx_map_get(propstat->map, key); + list = ucx_list_append(list, prop); ucx_map_put(propstat->map, key, list); } @@ -790,7 +791,7 @@ } UcxMapIterator iter = ucx_map_iterator(propstat->map); - UcxDlist *proplist; + UcxList *proplist; UCX_MAP_FOREACH(key, proplist, iter) { if(proplist) { sbuf_puts(out, "\n\n");