# HG changeset patch # User Olaf Wintermann # Date 1524995292 -7200 # Node ID 38ae05d46f9a154333618ae807475d263b71258e # Parent dcc03142eb5fe4597fb7a6c64641d776c85b8340 fixes creation of davql arg list diff -r dcc03142eb5f -r 38ae05d46f9a dav/sync.c --- a/dav/sync.c Sun Apr 29 11:16:41 2018 +0200 +++ b/dav/sync.c Sun Apr 29 11:48:12 2018 +0200 @@ -1369,6 +1369,7 @@ UcxList *local_tags = sync_get_file_tags(dir, local, &tags_changed); if(tags_changed) { switch(dir->tagconfig->conflict) { + case TAG_NO_CONFLICT: case TAG_KEEP_LOCAL: { store_empty_tags = TRUE; tags = local_tags; diff -r dcc03142eb5f -r 38ae05d46f9a libidav/davqlparser.c --- a/libidav/davqlparser.c Sun Apr 29 11:16:41 2018 +0200 +++ b/libidav/davqlparser.c Sun Apr 29 11:48:12 2018 +0200 @@ -1403,9 +1403,6 @@ if (depthexpr->type == DAVQL_NUMBER) { if (depthexpr->srctext.ptr[0] == '%') { stmt->depth = DAV_DEPTH_PLACEHOLDER; - stmt->args = ucx_list_append( - stmt->args, - (void*)(intptr_t)depthexpr->srctext.ptr[1]); } else { sstr_t depthstr = depthexpr->srctext; char *conv = malloc(depthstr.length+1); @@ -1623,7 +1620,7 @@ if (stmt->errorcode) { return; } - dav_add_fmt_args(stmt, stmt->path); // add possible path args + //dav_add_fmt_args(stmt, stmt->path); // add possible path args // Consume with clause (if any) if (token_is(tokens, DAVQL_TOKEN_KEYWORD)