From: Timo Sirainen Date: Thu, 24 Nov 2016 13:41:38 +0000 (+0200) Subject: lib-storage: Rename mailbox_list_index.corrupted to corrupted_names_or_parents X-Git-Tag: 2.2.27~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=745c851f59ca66b4bd7e8b23c2ca413709c31ee2;p=thirdparty%2Fdovecot%2Fcore.git lib-storage: Rename mailbox_list_index.corrupted to corrupted_names_or_parents Makes it clearer what exactly the flag means. --- diff --git a/src/lib-storage/list/mailbox-list-index-sync.c b/src/lib-storage/list/mailbox-list-index-sync.c index 50260e35f0..411bdf9415 100644 --- a/src/lib-storage/list/mailbox-list-index-sync.c +++ b/src/lib-storage/list/mailbox-list-index-sync.c @@ -335,12 +335,12 @@ static void mailbox_list_index_sync_update_hdr(struct mailbox_list_index_sync_context *sync_ctx) { if (sync_ctx->orig_highest_name_id != sync_ctx->ilist->highest_name_id || - sync_ctx->ilist->corrupted) { + sync_ctx->ilist->corrupted_names_or_parents) { /* new names added. this implicitly resets refresh flag */ T_BEGIN { mailbox_list_index_sync_names(sync_ctx); } T_END; - sync_ctx->ilist->corrupted = FALSE; + sync_ctx->ilist->corrupted_names_or_parents = FALSE; } else if (mailbox_list_index_need_refresh(sync_ctx->ilist, sync_ctx->view)) { /* we're synced, reset refresh flag */ @@ -397,7 +397,7 @@ mailbox_list_index_sync_update_corrupted_nodes(struct mailbox_list_index_sync_co static void mailbox_list_index_sync_update_corrupted(struct mailbox_list_index_sync_context *sync_ctx) { - if (!sync_ctx->ilist->corrupted) + if (!sync_ctx->ilist->corrupted_names_or_parents) return; mailbox_list_index_sync_update_corrupted_nodes(sync_ctx, diff --git a/src/lib-storage/list/mailbox-list-index.c b/src/lib-storage/list/mailbox-list-index.c index d63afb1c4a..a56603c058 100644 --- a/src/lib-storage/list/mailbox-list-index.c +++ b/src/lib-storage/list/mailbox-list-index.c @@ -425,7 +425,7 @@ int mailbox_list_index_parse(struct mailbox_list *list, mail_index_mark_corrupted(ilist->index); return -1; } - ilist->corrupted = TRUE; + ilist->corrupted_names_or_parents = TRUE; } if (mailbox_list_index_parse_records(ilist, view, &error) < 0) { mailbox_list_set_critical(list, @@ -437,7 +437,7 @@ int mailbox_list_index_parse(struct mailbox_list *list, } /* FIXME: find any missing mailboxes, add them and write the index back. */ - ilist->corrupted = TRUE; + ilist->corrupted_names_or_parents = TRUE; } return 0; } diff --git a/src/lib-storage/list/mailbox-list-index.h b/src/lib-storage/list/mailbox-list-index.h index 86b12a3db9..3697d67b83 100644 --- a/src/lib-storage/list/mailbox-list-index.h +++ b/src/lib-storage/list/mailbox-list-index.h @@ -116,7 +116,7 @@ struct mailbox_list_index { unsigned int updating_status:1; unsigned int has_backing_store:1; unsigned int index_last_check_changed:1; - unsigned int corrupted:1; + unsigned int corrupted_names_or_parents:1; }; struct mailbox_list_index_iterate_context {