comparison: dav/sync.c
dav/sync.c
- changeset 775
- e5909dff0dbf
- parent 767
- f4acc783f25e
- child 779
- a0e02b70dad1
equal
deleted
inserted
replaced
| 774:8c8aed7e1756 | 775:e5909dff0dbf |
|---|---|
| 633 if(SYNC_HASHING(dir)) { | 633 if(SYNC_HASHING(dir)) { |
| 634 hashes = create_hash_index(db); | 634 hashes = create_hash_index(db); |
| 635 } | 635 } |
| 636 | 636 |
| 637 DavSession *sn = create_session(a, ctx, repo, dir->collection); | 637 DavSession *sn = create_session(a, ctx, repo, dir->collection); |
| 638 util_regdestr(sn->mp, db, (cx_destructor_func)destroy_db); | 638 cxMempoolRegister(sn->mp, db, (cx_destructor_func)destroy_db); |
| 639 if (cmd_getoption(a, "verbose")) { | 639 if (cmd_getoption(a, "verbose")) { |
| 640 curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L); | 640 curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L); |
| 641 curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr); | 641 curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr); |
| 642 } | 642 } |
| 643 | 643 |
| 1964 return -1; | 1964 return -1; |
| 1965 } | 1965 } |
| 1966 remove_deleted_conflicts(dir, db); | 1966 remove_deleted_conflicts(dir, db); |
| 1967 | 1967 |
| 1968 DavSession *sn = create_session(a, ctx, repo, dir->collection); | 1968 DavSession *sn = create_session(a, ctx, repo, dir->collection); |
| 1969 util_regdestr(sn->mp, db, (cx_destructor_func)destroy_db); | 1969 cxMempoolRegister(sn->mp, db, (cx_destructor_func)destroy_db); |
| 1970 if (cmd_getoption(a, "verbose")) { | 1970 if (cmd_getoption(a, "verbose")) { |
| 1971 curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L); | 1971 curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L); |
| 1972 curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr); | 1972 curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr); |
| 1973 } | 1973 } |
| 1974 if(SYNC_STORE_HASH(dir)) { | 1974 if(SYNC_STORE_HASH(dir)) { |
| 2632 if(!repo) { | 2632 if(!repo) { |
| 2633 fprintf(stderr, "Unkown repository %s\n", dir->name); | 2633 fprintf(stderr, "Unkown repository %s\n", dir->name); |
| 2634 return -1; | 2634 return -1; |
| 2635 } | 2635 } |
| 2636 DavSession *sn = create_session(a, ctx, repo, dir->collection); | 2636 DavSession *sn = create_session(a, ctx, repo, dir->collection); |
| 2637 util_regdestr(sn->mp, db, (cx_destructor_func)destroy_db); | 2637 cxMempoolRegister(sn->mp, db, (cx_destructor_func)destroy_db); |
| 2638 if (cmd_getoption(a, "verbose")) { | 2638 if (cmd_getoption(a, "verbose")) { |
| 2639 curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L); | 2639 curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L); |
| 2640 curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr); | 2640 curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr); |
| 2641 } | 2641 } |
| 2642 | 2642 |
| 5014 return -1; | 5014 return -1; |
| 5015 } | 5015 } |
| 5016 remove_deleted_conflicts(dir, db); | 5016 remove_deleted_conflicts(dir, db); |
| 5017 | 5017 |
| 5018 DavSession *sn = create_session(a, ctx, repo, dir->collection); | 5018 DavSession *sn = create_session(a, ctx, repo, dir->collection); |
| 5019 util_regdestr(sn->mp, db, (cx_destructor_func)destroy_db); | 5019 cxMempoolRegister(sn->mp, db, (cx_destructor_func)destroy_db); |
| 5020 if (cmd_getoption(a, "verbose")) { | 5020 if (cmd_getoption(a, "verbose")) { |
| 5021 curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L); | 5021 curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L); |
| 5022 curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr); | 5022 curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr); |
| 5023 } | 5023 } |
| 5024 | 5024 |
