Mercurial > dovecot > original-hg > dovecot-1.2
changeset 6884:2bef19ae5233 HEAD
Removed pointless maildir_uidlist_sync_next_pre() calling.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sat, 01 Dec 2007 10:29:13 +0200 |
| parents | 15df8bb27d7a |
| children | a22b1a72ea89 |
| files | src/lib-storage/index/maildir/maildir-sync.c src/lib-storage/index/maildir/maildir-uidlist.c src/lib-storage/index/maildir/maildir-uidlist.h |
| diffstat | 3 files changed, 0 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/index/maildir/maildir-sync.c Sat Dec 01 09:51:43 2007 +0200 +++ b/src/lib-storage/index/maildir/maildir-sync.c Sat Dec 01 10:29:13 2007 +0200 @@ -437,17 +437,6 @@ if (dp->d_name[0] == '.') continue; - ret = maildir_uidlist_sync_next_pre(ctx->uidlist_sync_ctx, - dp->d_name); - if (ret == 0) { - /* new file and we couldn't lock uidlist, check this - later in next sync. */ - dir_changed = TRUE; - continue; - } - if (ret < 0) - break; - check_touch = FALSE; flags = 0; if (move_new) {
--- a/src/lib-storage/index/maildir/maildir-uidlist.c Sat Dec 01 09:51:43 2007 +0200 +++ b/src/lib-storage/index/maildir/maildir-uidlist.c Sat Dec 01 10:29:13 2007 +0200 @@ -1149,27 +1149,6 @@ ctx->finished = FALSE; } -int maildir_uidlist_sync_next_pre(struct maildir_uidlist_sync_ctx *ctx, - const char *filename) -{ - if (!UIDLIST_IS_LOCKED(ctx->uidlist) && - hash_lookup(ctx->uidlist->files, filename) == NULL && - (ctx->partial || hash_lookup(ctx->files, filename) == NULL)) { - if (!ctx->uidlist->initial_read) { - /* first time reading the uidlist */ - if (maildir_uidlist_refresh(ctx->uidlist) < 0) { - ctx->failed = TRUE; - return -1; - } - return maildir_uidlist_sync_next_pre(ctx, filename); - } - - return 0; - } - - return 1; -} - int maildir_uidlist_sync_next(struct maildir_uidlist_sync_ctx *ctx, const char *filename, enum maildir_uidlist_rec_flag flags)
--- a/src/lib-storage/index/maildir/maildir-uidlist.h Sat Dec 01 09:51:43 2007 +0200 +++ b/src/lib-storage/index/maildir/maildir-uidlist.h Sat Dec 01 10:29:13 2007 +0200 @@ -83,9 +83,6 @@ int maildir_uidlist_sync_init(struct maildir_uidlist *uidlist, enum maildir_uidlist_sync_flags sync_flags, struct maildir_uidlist_sync_ctx **sync_ctx_r); -/* Returns 1 = ok, -1 = error, 0 = new file and dovecot-uidlist is locked */ -int maildir_uidlist_sync_next_pre(struct maildir_uidlist_sync_ctx *ctx, - const char *filename); int maildir_uidlist_sync_next(struct maildir_uidlist_sync_ctx *ctx, const char *filename, enum maildir_uidlist_rec_flag flags);