# HG changeset patch # User Olaf Wintermann # Date 1528738361 -7200 # Node ID 6e1861e8262c19afef3814a76f8c7fad9ca925d6 # Parent ea50585ec9d9796da0ac0c4f1e449dc59892a488 check tagfilter scope after checking tagfilter existence diff -r ea50585ec9d9 -r 6e1861e8262c dav/sync.c --- a/dav/sync.c Mon Jun 11 19:31:03 2018 +0200 +++ b/dav/sync.c Mon Jun 11 19:32:41 2018 +0200 @@ -259,15 +259,15 @@ } static int res_matches_tags(DavResource *res, SyncTagFilter *tagfilter) { + if(!tagfilter || tagfilter->mode == DAV_SYNC_TAGFILTER_OFF) { + return 1; + } int scope = res->iscollection ? DAV_SYNC_TAGFILTER_SCOPE_COLLECTION : DAV_SYNC_TAGFILTER_SCOPE_RESOURCE; if(tagfilter->scope & scope != scope) { return 1; } - if(!tagfilter || tagfilter->mode == DAV_SYNC_TAGFILTER_OFF) { - return 1; - } DavXmlNode *tagsprop = dav_get_property_ns(res, DAV_NS, "tags"); UcxList *res_tags = parse_dav_xml_taglist(tagsprop); @@ -285,15 +285,15 @@ LocalResource *res, SyncTagFilter *tagfilter) { + if(!tagfilter || tagfilter->mode == DAV_SYNC_TAGFILTER_OFF) { + return 1; + } int scope = res->isdirectory ? DAV_SYNC_TAGFILTER_SCOPE_COLLECTION : DAV_SYNC_TAGFILTER_SCOPE_RESOURCE; if(tagfilter->scope & scope != scope) { return 1; } - if(!tagfilter || tagfilter->mode == DAV_SYNC_TAGFILTER_OFF) { - return 1; - } DavBool changed = 0; UcxList *res_tags = sync_get_file_tags(dir, res, &changed);