comparison: dav/sync.c
dav/sync.c
- changeset 521
- c5bbae4b3cca
- parent 516
- 39f5f17c3bc3
- child 522
- 46f96dcd6eab
equal
deleted
inserted
replaced
| 520:da2b0cc44e4f | 521:c5bbae4b3cca |
|---|---|
| 731 locked = FALSE; | 731 locked = FALSE; |
| 732 } | 732 } |
| 733 } | 733 } |
| 734 | 734 |
| 735 // store db | 735 // store db |
| 736 if(store_db(db, dir->database)) { | 736 if(store_db(db, dir->database, dir->db_settings)) { |
| 737 fprintf(stderr, "Cannot store sync db\n"); | 737 fprintf(stderr, "Cannot store sync db\n"); |
| 738 ret = -2; | 738 ret = -2; |
| 739 } | 739 } |
| 740 | 740 |
| 741 // cleanup | 741 // cleanup |
| 1392 locked = FALSE; | 1392 locked = FALSE; |
| 1393 } | 1393 } |
| 1394 } | 1394 } |
| 1395 | 1395 |
| 1396 // store db | 1396 // store db |
| 1397 if(store_db(db, dir->database)) { | 1397 if(store_db(db, dir->database, dir->db_settings)) { |
| 1398 fprintf(stderr, "Cannot store sync db\n"); | 1398 fprintf(stderr, "Cannot store sync db\n"); |
| 1399 ret = -2; | 1399 ret = -2; |
| 1400 } | 1400 } |
| 1401 | 1401 |
| 1402 // cleanup | 1402 // cleanup |
| 1547 locked = FALSE; | 1547 locked = FALSE; |
| 1548 } | 1548 } |
| 1549 } | 1549 } |
| 1550 | 1550 |
| 1551 // store db | 1551 // store db |
| 1552 if(store_db(db, dir->database)) { | 1552 if(store_db(db, dir->database, dir->db_settings)) { |
| 1553 fprintf(stderr, "Cannot store sync db\n"); | 1553 fprintf(stderr, "Cannot store sync db\n"); |
| 1554 ret = -2; | 1554 ret = -2; |
| 1555 } | 1555 } |
| 1556 | 1556 |
| 1557 // cleanup | 1557 // cleanup |
| 2546 int num_conflict = db->conflict->count; | 2546 int num_conflict = db->conflict->count; |
| 2547 ucx_map_free_content(db->conflict, (ucx_destructor)local_resource_free); | 2547 ucx_map_free_content(db->conflict, (ucx_destructor)local_resource_free); |
| 2548 ucx_map_clear(db->conflict); | 2548 ucx_map_clear(db->conflict); |
| 2549 | 2549 |
| 2550 // store db | 2550 // store db |
| 2551 if(store_db(db, dir->database)) { | 2551 if(store_db(db, dir->database, dir->db_settings)) { |
| 2552 fprintf(stderr, "Cannot store sync db\n"); | 2552 fprintf(stderr, "Cannot store sync db\n"); |
| 2553 fprintf(stderr, "Abort\n"); | 2553 fprintf(stderr, "Abort\n"); |
| 2554 ret = -2; | 2554 ret = -2; |
| 2555 } | 2555 } |
| 2556 | 2556 |
| 2612 } | 2612 } |
| 2613 ucx_map_free_content(db->conflict, (ucx_destructor)local_resource_free); | 2613 ucx_map_free_content(db->conflict, (ucx_destructor)local_resource_free); |
| 2614 ucx_map_clear(db->conflict); | 2614 ucx_map_clear(db->conflict); |
| 2615 | 2615 |
| 2616 // store db | 2616 // store db |
| 2617 if(store_db(db, dir->database)) { | 2617 if(store_db(db, dir->database, dir->db_settings)) { |
| 2618 fprintf(stderr, "Cannot store sync db\n"); | 2618 fprintf(stderr, "Cannot store sync db\n"); |
| 2619 fprintf(stderr, "Abort\n"); | 2619 fprintf(stderr, "Abort\n"); |
| 2620 ret = -1; | 2620 ret = -1; |
| 2621 } | 2621 } |
| 2622 | 2622 |
| 2937 } | 2937 } |
| 2938 } | 2938 } |
| 2939 } | 2939 } |
| 2940 | 2940 |
| 2941 // store db | 2941 // store db |
| 2942 if(store_db(db, file.dir->database)) { | 2942 if(store_db(db, file.dir->database, file.dir->db_settings)) { |
| 2943 fprintf(stderr, "Cannot store sync db\n"); | 2943 fprintf(stderr, "Cannot store sync db\n"); |
| 2944 ret = -2; | 2944 ret = -2; |
| 2945 } | 2945 } |
| 2946 | 2946 |
| 2947 free(file.path); | 2947 free(file.path); |
