We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
It was used only by BDB.
diff --git a/cunit/annotate.testc b/cunit/annotate.testc index 84df8894c..3f8e5cb3b 100644 --- a/cunit/annotate.testc +++ b/cunit/annotate.testc @@ -1934,10 +1934,10 @@ static int set_up(void) isadmin = 0; auth_state = auth_newstate(userid); - quotadb_init(0); + quotadb_init(); quotadb_open(NULL); - mboxlist_init(0); + mboxlist_init(); mboxlist_open(NULL); memset(&mbentry, 0, sizeof(mbentry)); diff --git a/cunit/quota.testc b/cunit/quota.testc index f315582be..ddd379d8a 100644 --- a/cunit/quota.testc +++ b/cunit/quota.testc @@ -1039,7 +1039,7 @@ static int set_up(void) cyrusdb_init(); config_quota_db = "skiplist"; - quotadb_init(0); + quotadb_init(); quotadb_open(NULL); return 0; diff --git a/doc/internal/cyrusdb-api.html b/doc/internal/cyrusdb-api.html index 6df87b40c..23b69b499 100644 --- a/doc/internal/cyrusdb-api.html +++ b/doc/internal/cyrusdb-api.html @@ -125,11 +125,6 @@ and an error code on failure</p> any cleaning up after all database usage is finished. Don't call this yourself, use <tt>cyrus_done()</tt>.</p> -<h3>cyrusdb_sync(const char *backend)</h3> - -<p>Perform a checkpoint of the database environment. Used by berkeley -backend. Is called by <tt>ctl_cyrusdb -c</tt> on a regular basis</p> - <!-- XXX update this bit to document the cyrusdb_archiver api <h3>archive(const char **fnames, const char *dirname)</h3> diff --git a/imap/ctl_cyrusdb.c b/imap/ctl_cyrusdb.c index b765347ad..7af77c930 100644 --- a/imap/ctl_cyrusdb.c +++ b/imap/ctl_cyrusdb.c @@ -326,17 +326,7 @@ int main(int argc, char *argv[]) break; case CHECKPOINT: - r2 = cyrusdb_sync(*dblist[i].configptr); - if (r2) { - syslog(LOG_ERR, "DBERROR: sync %s: %s", dirname, - cyrusdb_strerror(r2)); - fprintf(stderr, - "ctl_cyrusdb: unable to sync environment\n"); - } - /* ARCHIVE */ - r2 = 0; - if (!rotated) { /* rotate the backup directories -- ONE time only */ char *file; diff --git a/imap/ctl_mboxlist.c b/imap/ctl_mboxlist.c index b51dac242..2a01e9d1c 100644 --- a/imap/ctl_mboxlist.c +++ b/imap/ctl_mboxlist.c @@ -998,7 +998,7 @@ int main(int argc, char *argv[]) case CHECKPOINT: syslog(LOG_NOTICE, "checkpointing mboxlist"); - mboxlist_init(MBOXLIST_SYNC); + mboxlist_init(); mboxlist_open(NULL); mboxlist_close(); mboxlist_done(); @@ -1010,7 +1010,7 @@ int main(int argc, char *argv[]) GCC_FALLTHROUGH case DUMP: - mboxlist_init(0); + mboxlist_init(); mboxlist_open(mboxdb_fname); do_dump(op, partition, dopurge); @@ -1025,7 +1025,7 @@ int main(int argc, char *argv[]) break; case UNDUMP: - mboxlist_init(0); + mboxlist_init(); mboxlist_open(mboxdb_fname); do_undump(); @@ -1035,7 +1035,7 @@ int main(int argc, char *argv[]) break; case VERIFY: - mboxlist_init(0); + mboxlist_init(); mboxlist_open(mboxdb_fname); do_verify(); diff --git a/imap/cyr_deny.c b/imap/cyr_deny.c index 991e70cad..d3de1b2f3 100644 --- a/imap/cyr_deny.c +++ b/imap/cyr_deny.c @@ -233,7 +233,7 @@ int main(int argc, char **argv) cyrus_init(alt_config, "cyr_deny", 0, 0); - denydb_init(0); + denydb_init(); r = denydb_open(/*create*/(mode == DENY)); if (r) { diff --git a/imap/mboxlist.c b/imap/mboxlist.c index 8aea380b3..426569df4 100644 --- a/imap/mboxlist.c +++ b/imap/mboxlist.c @@ -3373,7 +3373,7 @@ static void done_cb(void*rock __attribute__((unused))) static void init_internal() { if (!mboxlist_initialized) { - mboxlist_init(0); + mboxlist_init(); } if (!mboxlist_dbopen) { mboxlist_open(NULL); @@ -3381,11 +3381,8 @@ static void init_internal() } /* must be called after cyrus_init */ -EXPORTED void mboxlist_init(int myflags) +EXPORTED void mboxlist_init(void) { - if (myflags & MBOXLIST_SYNC) { - cyrusdb_sync(DB); - } cyrus_modules_add(done_cb, NULL); mboxlist_initialized = 1; } @@ -3404,7 +3401,7 @@ EXPORTED void mboxlist_open(const char *fname) fname = tofree; } - mboxlist_init(0); + mboxlist_init(); flags = CYRUSDB_CREATE; if (config_getswitch(IMAPOPT_IMPROVED_MBOXLIST_SORT)) { diff --git a/imap/mboxlist.h b/imap/mboxlist.h index f171a1463..1bf9a9a12 100644 --- a/imap/mboxlist.h +++ b/imap/mboxlist.h @@ -289,8 +289,7 @@ void mboxlist_open(const char *name); void mboxlist_close(void); /* initialize database structures */ -#define MBOXLIST_SYNC 0x02 -void mboxlist_init(int flags); +void mboxlist_init(void); /* done with database stuff */ void mboxlist_done(void); diff --git a/imap/quota.c b/imap/quota.c index 985ce10a3..694342b10 100644 --- a/imap/quota.c +++ b/imap/quota.c @@ -192,7 +192,7 @@ int main(int argc,char **argv) * Lock mailbox list to prevent mailbox creation/deletion * during work */ - mboxlist_init(0); + mboxlist_init(); mboxlist_open(NULL); quota_changelock(); diff --git a/imap/quota.h b/imap/quota.h index 815966a6a..66d690eb8 100644 --- a/imap/quota.h +++ b/imap/quota.h @@ -135,8 +135,7 @@ extern int quotadb_foreach(const char *prefix, size_t prefixlen, void quotadb_close(void); /* initialize database structures */ -#define QUOTADB_SYNC 0x02 -void quotadb_init(int flags); +void quotadb_init(void); /* done with database stuff */ void quotadb_done(void); diff --git a/imap/quota_db.c b/imap/quota_db.c index c1141ee92..5fb6b9134 100644 --- a/imap/quota_db.c +++ b/imap/quota_db.c @@ -636,7 +636,7 @@ static void done_cb(void*rock __attribute__((unused))) static void init_internal() { if (!quota_initialized) { - quotadb_init(0); + quotadb_init(); quota_initialized = 1; } if (!quota_dbopen) { @@ -645,11 +645,8 @@ static void init_internal() { } /* must be called after cyrus_init */ -EXPORTED void quotadb_init(int myflags) +EXPORTED void quotadb_init(void) { - if (myflags & QUOTADB_SYNC) { - cyrusdb_sync(QDB); - } cyrus_modules_add(done_cb, NULL); } diff --git a/imap/userdeny.h b/imap/userdeny.h index a1a207c30..2eea88035 100644 --- a/imap/userdeny.h +++ b/imap/userdeny.h @@ -63,8 +63,7 @@ int denydb_open(int create); void denydb_close(void); /* initialize database structures */ -#define DENYDB_SYNC 0x02 -void denydb_init(int flags); +void denydb_init(void); /* done with database stuff */ void denydb_done(void); diff --git a/imap/userdeny_db.c b/imap/userdeny_db.c index ca6f62754..15c482d84 100644 --- a/imap/userdeny_db.c +++ b/imap/userdeny_db.c @@ -348,7 +348,7 @@ static void done_cb(void*rock __attribute__((unused))) static void init_internal() { if (!denydb_initialized) { - denydb_init(0); + denydb_init(); cyrus_modules_add(done_cb, NULL); } if (!denydb) { @@ -357,11 +357,8 @@ static void init_internal() } /* must be called after cyrus_init */ -EXPORTED void denydb_init(int myflags) +EXPORTED void denydb_init(void) { - if (myflags & DENYDB_SYNC) { - cyrusdb_sync(DENYDB); - } denydb_initialized = 1; } diff --git a/lib/cyrusdb.c b/lib/cyrusdb.c index 5196deb84..a3463ee83 100644 --- a/lib/cyrusdb.c +++ b/lib/cyrusdb.c @@ -550,12 +550,6 @@ EXPORTED const char *cyrusdb_detect(const char *fname) return NULL; } -EXPORTED int cyrusdb_sync(const char *backend) -{ - struct cyrusdb_backend *db = cyrusdb_fromname(backend); - return db->sync(); -} - EXPORTED int cyrusdb_unlink(const char *backend, const char *fname, int flags) { struct cyrusdb_backend *db = cyrusdb_fromname(backend); @@ -602,11 +596,6 @@ HIDDEN int cyrusdb_generic_done(void) return 0; } -HIDDEN int cyrusdb_generic_sync(void) -{ - return 0; -} - HIDDEN int cyrusdb_generic_archive(const strarray_t *fnames, const char *dirname) { diff --git a/lib/cyrusdb.h b/lib/cyrusdb.h index b44266d83..ac478f18f 100644 --- a/lib/cyrusdb.h +++ b/lib/cyrusdb.h @@ -103,9 +103,6 @@ struct cyrusdb_backend { * to reset state */ int (*done)(void); - /* checkpoints this database environment */ - int (*sync)(void); - /* archives this database environment, and specified databases * into the specified directory */ int (*archive)(const strarray_t *fnames, const char *dirname); @@ -298,7 +295,6 @@ extern int cyrusdb_compar(struct db *db, /* somewhat special case, because they don't take a DB */ -extern int cyrusdb_sync(const char *backend); extern cyrusdb_archiver *cyrusdb_getarchiver(const char *backend); extern int cyrusdb_canfetchnext(const char *backend); @@ -308,7 +304,6 @@ extern strarray_t *cyrusdb_backends(void); /* generic implementations */ int cyrusdb_generic_init(const char *dbdir, int myflags); int cyrusdb_generic_done(void); -int cyrusdb_generic_sync(void); int cyrusdb_generic_archive(const strarray_t *fnames, const char *dirname); int cyrusdb_generic_noarchive(const strarray_t *fnames, const char *dirname); int cyrusdb_generic_unlink(const char *fname, int flags); diff --git a/lib/cyrusdb_flat.c b/lib/cyrusdb_flat.c index c6320248e..adffaea77 100644 --- a/lib/cyrusdb_flat.c +++ b/lib/cyrusdb_flat.c @@ -835,7 +835,6 @@ EXPORTED struct cyrusdb_backend cyrusdb_flat = &cyrusdb_generic_init, &cyrusdb_generic_done, - &cyrusdb_generic_sync, &cyrusdb_generic_archive, &cyrusdb_generic_unlink, diff --git a/lib/cyrusdb_quotalegacy.c b/lib/cyrusdb_quotalegacy.c index ee20db8b9..e0e99043a 100644 --- a/lib/cyrusdb_quotalegacy.c +++ b/lib/cyrusdb_quotalegacy.c @@ -879,7 +879,6 @@ HIDDEN struct cyrusdb_backend cyrusdb_quotalegacy = &cyrusdb_generic_init, &cyrusdb_generic_done, - &cyrusdb_generic_sync, &cyrusdb_generic_noarchive, &cyrusdb_generic_unlink, diff --git a/lib/cyrusdb_skiplist.c b/lib/cyrusdb_skiplist.c index 8768c81db..8d22d2cf6 100644 --- a/lib/cyrusdb_skiplist.c +++ b/lib/cyrusdb_skiplist.c @@ -2452,7 +2452,6 @@ EXPORTED struct cyrusdb_backend cyrusdb_skiplist = &myinit, &cyrusdb_generic_done, - &cyrusdb_generic_sync, &cyrusdb_generic_archive, &cyrusdb_generic_unlink, diff --git a/lib/cyrusdb_sql.c b/lib/cyrusdb_sql.c index feacbc6e2..8c7ee6b83 100644 --- a/lib/cyrusdb_sql.c +++ b/lib/cyrusdb_sql.c @@ -898,7 +898,6 @@ HIDDEN struct cyrusdb_backend cyrusdb_sql = &init, &done, - &cyrusdb_generic_sync, &cyrusdb_generic_noarchive, NULL, diff --git a/lib/cyrusdb_twoskip.c b/lib/cyrusdb_twoskip.c index 1d7b0fd7e..b0cfb4171 100644 --- a/lib/cyrusdb_twoskip.c +++ b/lib/cyrusdb_twoskip.c @@ -2389,7 +2389,6 @@ HIDDEN struct cyrusdb_backend cyrusdb_twoskip = &cyrusdb_generic_init, &cyrusdb_generic_done, - &cyrusdb_generic_sync, &cyrusdb_generic_archive, &cyrusdb_generic_unlink,
The text was updated successfully, but these errors were encountered:
Moved to #2706.
Sorry, something went wrong.
No branches or pull requests
It was used only by BDB.
The text was updated successfully, but these errors were encountered: