dovecot-2.0: mdbox: Changed error messages to contain "mdbox" pr...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/6e1bbf87749f
changeset: 11217:6e1bbf87749f
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Apr 29 18:43:51 2010 +0300
description:
mdbox: Changed error messages to contain "mdbox" prefix instead of "dbox".

diffstat:

 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(-)

diffs (105 lines):

diff -r de0ed7bea201 -r 6e1bbf87749f src/lib-storage/index/dbox-multi/mdbox-mail.c
--- a/src/lib-storage/index/dbox-multi/mdbox-mail.c	Thu Apr 29 18:43:02 2010 +0300
+++ b/src/lib-storage/index/dbox-multi/mdbox-mail.c	Thu Apr 29 18:43:51 2010 +0300
@@ -28,7 +28,7 @@
 	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 @@
 	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 -r de0ed7bea201 -r 6e1bbf87749f src/lib-storage/index/dbox-multi/mdbox-map.c
--- a/src/lib-storage/index/dbox-multi/mdbox-map.c	Thu Apr 29 18:43:02 2010 +0300
+++ b/src/lib-storage/index/dbox-multi/mdbox-map.c	Thu Apr 29 18:43:51 2010 +0300
@@ -35,7 +35,7 @@
 
 	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 @@
 	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 -r de0ed7bea201 -r 6e1bbf87749f src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
--- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c	Thu Apr 29 18:43:02 2010 +0300
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c	Thu Apr 29 18:43:51 2010 +0300
@@ -229,7 +229,7 @@
 		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 @@
 	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 @@
 		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 -r de0ed7bea201 -r 6e1bbf87749f src/lib-storage/index/dbox-multi/mdbox-storage.c
--- a/src/lib-storage/index/dbox-multi/mdbox-storage.c	Thu Apr 29 18:43:02 2010 +0300
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage.c	Thu Apr 29 18:43:51 2010 +0300
@@ -43,7 +43,7 @@
 	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 @@
 	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 -r de0ed7bea201 -r 6e1bbf87749f src/lib-storage/index/dbox-multi/mdbox-sync.c
--- a/src/lib-storage/index/dbox-multi/mdbox-sync.c	Thu Apr 29 18:43:02 2010 +0300
+++ b/src/lib-storage/index/dbox-multi/mdbox-sync.c	Thu Apr 29 18:43:51 2010 +0300
@@ -261,7 +261,7 @@
 				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;
 		}