From ddb018bc886680f462463b2c87f983fdedbf6cf0 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 29 Apr 2010 18:43:51 +0300 Subject: [PATCH] mdbox: Changed error messages to contain "mdbox" prefix instead of "dbox". --HG-- branch : HEAD --- src/lib-storage/index/dbox-multi/mdbox-mail.c | 4 ++-- src/lib-storage/index/dbox-multi/mdbox-map.c | 4 ++-- src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c | 6 +++--- src/lib-storage/index/dbox-multi/mdbox-storage.c | 4 ++-- src/lib-storage/index/dbox-multi/mdbox-sync.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib-storage/index/dbox-multi/mdbox-mail.c b/src/lib-storage/index/dbox-multi/mdbox-mail.c index 2d5701985f..9048c79cb0 100644 --- a/src/lib-storage/index/dbox-multi/mdbox-mail.c +++ b/src/lib-storage/index/dbox-multi/mdbox-mail.c @@ -28,7 +28,7 @@ int mdbox_mail_lookup(struct mdbox_mailbox *mbox, struct mail_index_view *view, if (dbox_rec == NULL || dbox_rec->map_uid == 0) { mail_index_lookup_uid(view, seq, &uid); mail_storage_set_critical(&mbox->storage->storage.storage, - "dbox %s: map uid lost for uid %u", + "mdbox %s: map uid lost for uid %u", mbox->box.path, uid); mdbox_storage_set_corrupted(mbox->storage); return -1; @@ -47,7 +47,7 @@ int mdbox_mail_lookup(struct mdbox_mailbox *mbox, struct mail_index_view *view, cur_map_uid_validity = dbox_map_get_uid_validity(mbox->storage->map); if (cur_map_uid_validity != mbox->map_uid_validity) { mail_storage_set_critical(&mbox->storage->storage.storage, - "dbox %s: map uidvalidity mismatch (%u vs %u)", + "mdbox %s: map uidvalidity mismatch (%u vs %u)", mbox->box.path, mbox->map_uid_validity, cur_map_uid_validity); mdbox_storage_set_corrupted(mbox->storage); diff --git a/src/lib-storage/index/dbox-multi/mdbox-map.c b/src/lib-storage/index/dbox-multi/mdbox-map.c index bcacd679e4..bcf9b754b9 100644 --- a/src/lib-storage/index/dbox-multi/mdbox-map.c +++ b/src/lib-storage/index/dbox-multi/mdbox-map.c @@ -35,7 +35,7 @@ void dbox_map_set_corrupted(struct dbox_map *map, const char *format, ...) va_start(args, format); mail_storage_set_critical(MAP_STORAGE(map), - "dbox map %s corrupted: %s", + "mdbox map %s corrupted: %s", map->index->filepath, t_strdup_vprintf(format, args)); va_end(args); @@ -414,7 +414,7 @@ dbox_map_sync_handle(struct dbox_map *map, struct mail_index_sync_ctx *sync_ctx) mail_index_sync_get_offsets(sync_ctx, &seq1, &offset1, &seq2, &offset2); if (offset1 != offset2 || seq1 != seq2) { /* something had crashed. need a full resync. */ - i_warning("dbox %s: Inconsistency in map index " + i_warning("mdbox %s: Inconsistency in map index " "(%u,%"PRIuUOFF_T" != %u,%"PRIuUOFF_T")", map->path, seq1, offset1, seq2, offset2); mdbox_storage_set_corrupted(map->storage); diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c index 9d71e88273..c9499d79ee 100644 --- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c +++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c @@ -229,7 +229,7 @@ static int rebuild_add_file(struct mdbox_storage_rebuild_context *ctx, ext = strrchr(fname, '.'); if (ext == NULL || (strcmp(ext, ".broken") != 0 && strcmp(ext, ".lock") != 0)) { - i_warning("dbox rebuild: " + i_warning("mdbox rebuild: " "Skipping file with missing ID: %s", path); } return 0; @@ -245,7 +245,7 @@ static int rebuild_add_file(struct mdbox_storage_rebuild_context *ctx, if ((ret = dbox_file_open(file, &deleted)) > 0 && !deleted) ret = rebuild_file_mails(ctx, file); if (ret == 0) - i_error("dbox rebuild: Failed to fix file %s", path); + i_error("mdbox rebuild: Failed to fix file %s", path); dbox_file_unref(&file); return ret < 0 ? -1 : 0; } @@ -831,7 +831,7 @@ static int mdbox_storage_rebuild_scan(struct mdbox_storage_rebuild_context *ctx) return 0; } - i_warning("dbox %s: rebuilding indexes", ctx->storage->storage_dir); + i_warning("mdbox %s: rebuilding indexes", ctx->storage->storage_dir); uid_validity = dbox_map_get_uid_validity(ctx->storage->map); hdr = mail_index_get_header(ctx->sync_view); diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage.c b/src/lib-storage/index/dbox-multi/mdbox-storage.c index 83540da787..a36bb72e9b 100644 --- a/src/lib-storage/index/dbox-multi/mdbox-storage.c +++ b/src/lib-storage/index/dbox-multi/mdbox-storage.c @@ -43,7 +43,7 @@ mdbox_storage_create(struct mail_storage *_storage, struct mail_namespace *ns, storage->set = mail_storage_get_driver_settings(_storage); if (*ns->list->set.mailbox_dir_name == '\0') { - *error_r = "dbox: MAILBOXDIR must not be empty"; + *error_r = "mdbox: MAILBOXDIR must not be empty"; return -1; } @@ -144,7 +144,7 @@ int mdbox_read_header(struct mdbox_mailbox *mbox, if (data_size < MDBOX_INDEX_HEADER_MIN_SIZE && (!mbox->creating || data_size != 0)) { mail_storage_set_critical(&mbox->storage->storage.storage, - "dbox %s: Invalid dbox header size: %"PRIuSIZE_T, + "mdbox %s: Invalid dbox header size: %"PRIuSIZE_T, mbox->box.path, data_size); mdbox_storage_set_corrupted(mbox->storage); return -1; diff --git a/src/lib-storage/index/dbox-multi/mdbox-sync.c b/src/lib-storage/index/dbox-multi/mdbox-sync.c index 863afec69f..69463eda52 100644 --- a/src/lib-storage/index/dbox-multi/mdbox-sync.c +++ b/src/lib-storage/index/dbox-multi/mdbox-sync.c @@ -261,7 +261,7 @@ int mdbox_sync_begin(struct mdbox_mailbox *mbox, enum mdbox_sync_flags flags, return mdbox_sync_begin(mbox, flags, ctx_r); } mail_storage_set_critical(storage, - "dbox %s: Storage keeps breaking", + "mdbox %s: Storage keeps breaking", ctx->mbox->box.path); ret = -1; } -- 2.47.3