From: Martti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
Date: Mon, 27 Nov 2017 11:52:07 +0000 (+0200)
Subject: quota: Take mailbox as parameter in quota_set_storage_error()
X-Git-Tag: 2.3.0.rc1~168
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0060557e0171750089c3cee3878ddbf67ac7c4e8;p=thirdparty%2Fdovecot%2Fcore.git

quota: Take mailbox as parameter in quota_set_storage_error()

This is to start using mailbox_set_critical() later.
---

diff --git a/src/plugins/quota/quota-storage.c b/src/plugins/quota/quota-storage.c
index 1a98e48755..fcc3147ef6 100644
--- a/src/plugins/quota/quota-storage.c
+++ b/src/plugins/quota/quota-storage.c
@@ -47,11 +47,12 @@ static MODULE_CONTEXT_DEFINE_INIT(quota_mailbox_list_module,
 				  &mailbox_list_module_register);
 
 static void quota_set_storage_error(struct quota_transaction_context *qt,
-				    struct mail_storage *storage,
+				    struct mailbox *box,
 				    enum quota_alloc_result res,
 				    const char *internal_err)
 {
 	const char *errstr = quota_alloc_result_errstr(res, qt);
+	struct mail_storage *storage = box->storage;
 	switch (res) {
 	case QUOTA_ALLOC_RESULT_OVER_MAXSIZE:
 		mail_storage_set_error(storage, MAIL_ERROR_LIMIT, errstr);
@@ -125,7 +126,7 @@ quota_get_status(struct mailbox *box, enum mailbox_status_items items,
 		const char *error;
 		enum quota_alloc_result qret = quota_test_alloc(qt, 0, &error);
 		if (qret != QUOTA_ALLOC_RESULT_OK) {
-			quota_set_storage_error(qt, box->storage, qret, error);
+			quota_set_storage_error(qt, box, qret, error);
 			ret = -1;
 		}
 		quota_transaction_rollback(&qt);
@@ -267,7 +268,7 @@ static int quota_check(struct mail_save_context *ctx, struct mailbox *src_box)
 		   background quota calculation, allow saving anyway. */
 		return 0;
 	default:
-		quota_set_storage_error(qt, t->box->storage, ret, error);
+		quota_set_storage_error(qt, t->box, ret, error);
 		return -1;
 	}
 }
@@ -336,7 +337,7 @@ quota_save_begin(struct mail_save_context *ctx, struct istream *input)
 			 * anyway. */
 			break;
 		default:
-			quota_set_storage_error(qt, t->box->storage, qret, error);
+			quota_set_storage_error(qt, t->box, qret, error);
 			return -1;
 		}
 	}