diff -r 279f343bbf6c -r fac51f87def0 src/server/webdav/saxhandler.cpp --- a/src/server/webdav/saxhandler.cpp Wed Jul 31 13:02:06 2013 +0200 +++ b/src/server/webdav/saxhandler.cpp Sun Sep 08 23:27:07 2013 +0200 @@ -32,23 +32,23 @@ #include #include "../ucx/string.h" -#include "../ucx/dlist.h" +#include "../ucx/list.h" #include "../util/pool.h" #include "saxhandler.h" using namespace std; -void xstack_push(UcxDlist **stack, XmlElement *elm) { - *stack = ucx_dlist_prepend(*stack, elm); +void xstack_push(UcxList **stack, XmlElement *elm) { + *stack = ucx_list_prepend(*stack, elm); } -XmlElement* xstack_pop(UcxDlist **stack) { +XmlElement* xstack_pop(UcxList **stack) { if(*stack == NULL) { return NULL; } XmlElement* ret = (XmlElement*)(*stack)->data; - UcxDlist *newstack = ucx_dlist_remove(*stack, *stack); + UcxList *newstack = ucx_list_remove(*stack, *stack); *stack = newstack; return ret; } @@ -121,12 +121,12 @@ if(!strcmp(ns, xmlns) && !strcmp(name, property->name)) { // add property to DavRequest - UcxDlist *elm = (UcxDlist*)pool_malloc(pool, sizeof(UcxDlist)); + UcxList *elm = (UcxList*)pool_malloc(pool, sizeof(UcxList)); elm->prev = NULL; elm->next = NULL; elm->data = property; //printf("saxhandler: add property: {%s}\n", property->name); - davrq->properties = ucx_dlist_concat(davrq->properties, elm); + davrq->properties = ucx_list_concat(davrq->properties, elm); property = NULL; } @@ -160,7 +160,7 @@ } ProppatchHandler::~ProppatchHandler() { - ucx_dlist_free(xmlStack); + ucx_list_free(xmlStack); } void ProppatchHandler::startElement( @@ -236,13 +236,13 @@ /* add the property to the proppatch request */ switch(updateMode) { case 0: { - davrq->setProps = ucx_dlist_append( + davrq->setProps = ucx_list_append( davrq->setProps, rootElement); break; } case 1: { - davrq->removeProps = ucx_dlist_append( + davrq->removeProps = ucx_list_append( davrq->removeProps, rootElement); break;