From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 11 Mar 2021 17:07:10 +0000 (+0200)
Subject: lib-storage: Remove mailbox_set_reason()
X-Git-Tag: 2.3.18~333
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=962efef5f75b3672507b141a32d5c909daf4404e;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Remove mailbox_set_reason()

Event reason_codes should be used instead. Keep the "Mailbox opened"
debug message mainly because it's often used in CI tests.
---

diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index bdea31d0d2..9537a5b6de 100644
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -390,8 +390,6 @@ struct mailbox {
 	/* Filled lazily when mailbox is opened, use mailbox_get_index_path()
 	   to access it */
 	const char *_index_path;
-	/* Reason for why mailbox is being accessed or NULL if unknown. */
-	const char *reason;
 
 	/* default vfuncs for new struct mails. */
 	const struct mail_vfuncs *mail_vfuncs;
diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 51dba8ae6a..732e74a153 100644
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -1091,13 +1091,6 @@ mailbox_alloc_for_user(struct mail_user *user, const char *mname,
 	return box;
 }
 
-void mailbox_set_reason(struct mailbox *box, const char *reason)
-{
-	i_assert(reason != NULL);
-
-	box->reason = p_strdup(box->pool, reason);
-}
-
 bool mailbox_is_autocreated(struct mailbox *box)
 {
 	if (box->inbox_user)
@@ -1462,14 +1455,9 @@ mailbox_open_full(struct mailbox *box, struct istream *input)
 	if (box->opened)
 		return 0;
 
-	if (box->reason != NULL) {
-		e_debug(box->event,
-			"Mailbox opened because: %s",
-			box->reason);
-	}
-
 	switch (box->open_error) {
 	case 0:
+		e_debug(box->event, "Mailbox opened");
 		break;
 	case MAIL_ERROR_NOTFOUND:
 		mail_storage_set_error(box->storage, MAIL_ERROR_NOTFOUND,
diff --git a/src/lib-storage/mail-storage.h b/src/lib-storage/mail-storage.h
index 25a98b269e..8487d520bc 100644
--- a/src/lib-storage/mail-storage.h
+++ b/src/lib-storage/mail-storage.h
@@ -529,9 +529,6 @@ struct mailbox *
 mailbox_alloc_for_user(struct mail_user *user, const char *mname,
 		       enum mailbox_flags flags);
 
-/* Set a human-readable reason for why this mailbox is being accessed.
-   This is used for logging purposes. */
-void mailbox_set_reason(struct mailbox *box, const char *reason);
 /* Get mailbox existence state. If auto_boxes=FALSE, return
    MAILBOX_EXISTENCE_NONE for autocreated mailboxes that haven't been
    physically created yet */