dovecot-2.2: lib-index: Removed MAIL_INDEX_SYNC_TYPE_APPEND. No ...
dovecot at dovecot.org
dovecot at dovecot.org
Sat Sep 15 19:56:59 EEST 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/5f483950b733
changeset: 15064:5f483950b733
user: Timo Sirainen <tss at iki.fi>
date: Sat Sep 15 19:56:47 2012 +0300
description:
lib-index: Removed MAIL_INDEX_SYNC_TYPE_APPEND. No backend cares about it.
diffstat:
src/lib-index/mail-index-sync.c | 31 ------------------------------
src/lib-index/mail-index.h | 1 -
src/lib-storage/index/cydir/cydir-sync.c | 3 --
src/lib-storage/index/imapc/imapc-sync.c | 3 --
src/lib-storage/index/index-sync-changes.c | 7 +-----
src/plugins/virtual/virtual-sync.c | 5 ----
6 files changed, 1 insertions(+), 49 deletions(-)
diffs (152 lines):
diff -r 0efc12f3eb2a -r 5f483950b733 src/lib-index/mail-index-sync.c
--- a/src/lib-index/mail-index-sync.c Sat Sep 15 19:54:21 2012 +0300
+++ b/src/lib-index/mail-index-sync.c Sat Sep 15 19:56:47 2012 +0300
@@ -24,10 +24,6 @@
ARRAY(struct mail_index_sync_list) sync_list;
uint32_t next_uid;
uint32_t last_tail_seq, last_tail_offset;
-
- uint32_t append_uid_first, append_uid_last;
-
- unsigned int sync_appends:1;
};
static void mail_index_sync_add_expunge(struct mail_index_sync_ctx *ctx)
@@ -123,20 +119,6 @@
mail_index_keywords_unref(&keywords);
}
-static void mail_index_sync_add_append(struct mail_index_sync_ctx *ctx)
-{
- const struct mail_index_record *rec = ctx->data;
-
- if (ctx->append_uid_first == 0 || rec->uid < ctx->append_uid_first)
- ctx->append_uid_first = rec->uid;
-
- rec = CONST_PTR_OFFSET(ctx->data, ctx->hdr->size - sizeof(*rec));
- if (rec->uid > ctx->append_uid_last)
- ctx->append_uid_last = rec->uid;
-
- ctx->sync_appends = TRUE;
-}
-
static bool mail_index_sync_add_transaction(struct mail_index_sync_ctx *ctx)
{
switch (ctx->hdr->type & MAIL_TRANSACTION_TYPE_MASK) {
@@ -155,9 +137,6 @@
case MAIL_TRANSACTION_KEYWORD_RESET:
mail_index_sync_add_keyword_reset(ctx);
break;
- case MAIL_TRANSACTION_APPEND:
- mail_index_sync_add_append(ctx);
- break;
default:
return FALSE;
}
@@ -686,13 +665,6 @@
if (i == count) {
if (next_i == (unsigned int)-1) {
/* nothing left in sync_list */
- if (ctx->sync_appends) {
- ctx->sync_appends = FALSE;
- sync_rec->type = MAIL_INDEX_SYNC_TYPE_APPEND;
- sync_rec->uid1 = ctx->append_uid_first;
- sync_rec->uid2 = ctx->append_uid_last;
- return TRUE;
- }
return FALSE;
}
ctx->next_uid = next_found_uid;
@@ -718,9 +690,6 @@
{
const struct mail_index_sync_list *sync_list;
- if (ctx->sync_appends)
- return TRUE;
-
array_foreach(&ctx->sync_list, sync_list) {
if (array_is_created(sync_list->array) &&
sync_list->idx != array_count(sync_list->array))
diff -r 0efc12f3eb2a -r 5f483950b733 src/lib-index/mail-index.h
--- a/src/lib-index/mail-index.h Sat Sep 15 19:54:21 2012 +0300
+++ b/src/lib-index/mail-index.h Sat Sep 15 19:56:47 2012 +0300
@@ -129,7 +129,6 @@
};
enum mail_index_sync_type {
- MAIL_INDEX_SYNC_TYPE_APPEND = 0x01,
MAIL_INDEX_SYNC_TYPE_EXPUNGE = 0x02,
MAIL_INDEX_SYNC_TYPE_FLAGS = 0x04,
MAIL_INDEX_SYNC_TYPE_KEYWORD_ADD = 0x08,
diff -r 0efc12f3eb2a -r 5f483950b733 src/lib-storage/index/cydir/cydir-sync.c
--- a/src/lib-storage/index/cydir/cydir-sync.c Sat Sep 15 19:54:21 2012 +0300
+++ b/src/lib-storage/index/cydir/cydir-sync.c Sat Sep 15 19:56:47 2012 +0300
@@ -87,9 +87,6 @@
}
switch (sync_rec.type) {
- case MAIL_INDEX_SYNC_TYPE_APPEND:
- /* don't care */
- break;
case MAIL_INDEX_SYNC_TYPE_EXPUNGE:
cydir_sync_expunge(ctx, seq1, seq2);
break;
diff -r 0efc12f3eb2a -r 5f483950b733 src/lib-storage/index/imapc/imapc-sync.c
--- a/src/lib-storage/index/imapc/imapc-sync.c Sat Sep 15 19:54:21 2012 +0300
+++ b/src/lib-storage/index/imapc/imapc-sync.c Sat Sep 15 19:56:47 2012 +0300
@@ -288,9 +288,6 @@
&seq1, &seq2)) {
/* already expunged, nothing to do. */
} else switch (sync_rec.type) {
- case MAIL_INDEX_SYNC_TYPE_APPEND:
- /* don't care */
- break;
case MAIL_INDEX_SYNC_TYPE_EXPUNGE:
imapc_sync_add_missing_deleted_flags(ctx, seq1, seq2);
seq_range_array_add_range(&ctx->expunged_uids,
diff -r 0efc12f3eb2a -r 5f483950b733 src/lib-storage/index/index-sync-changes.c
--- a/src/lib-storage/index/index-sync-changes.c Sat Sep 15 19:54:21 2012 +0300
+++ b/src/lib-storage/index/index-sync-changes.c Sat Sep 15 19:56:47 2012 +0300
@@ -101,8 +101,7 @@
orig_count = array_count(&ctx->syncs);
while (uid >= sync_rec->uid1) {
- if (uid <= sync_rec->uid2 &&
- sync_rec->type != MAIL_INDEX_SYNC_TYPE_APPEND) {
+ if (uid <= sync_rec->uid2) {
array_append(&ctx->syncs, sync_rec, 1);
if (sync_rec->type == MAIL_INDEX_SYNC_TYPE_EXPUNGE) {
@@ -118,10 +117,6 @@
}
switch (sync_rec->type) {
- case MAIL_INDEX_SYNC_TYPE_APPEND:
- /* ignore */
- memset(sync_rec, 0, sizeof(*sync_rec));
- break;
case MAIL_INDEX_SYNC_TYPE_EXPUNGE:
break;
case MAIL_INDEX_SYNC_TYPE_FLAGS:
diff -r 0efc12f3eb2a -r 5f483950b733 src/plugins/virtual/virtual-sync.c
--- a/src/plugins/virtual/virtual-sync.c Sat Sep 15 19:54:21 2012 +0300
+++ b/src/plugins/virtual/virtual-sync.c Sat Sep 15 19:56:47 2012 +0300
@@ -346,9 +346,6 @@
bool expunged;
switch (sync_rec->type) {
- case MAIL_INDEX_SYNC_TYPE_APPEND:
- /* don't care */
- return;
case MAIL_INDEX_SYNC_TYPE_EXPUNGE:
case MAIL_INDEX_SYNC_TYPE_FLAGS:
case MAIL_INDEX_SYNC_TYPE_KEYWORD_ADD:
@@ -407,8 +404,6 @@
modify_type, keywords);
mailbox_keywords_unref(&keywords);
break;
- case MAIL_INDEX_SYNC_TYPE_APPEND:
- i_unreached();
}
}
}
More information about the dovecot-cvs
mailing list