From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Tue, 13 Nov 2018 18:46:45 +0000 (+0100)
Subject: quota: Move quota_get_mail_size() to quota-util.c
X-Git-Tag: 2.4.1~152
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33a5fd223a48ba5e283cae43a6ace917c0fae09f;p=thirdparty%2Fdovecot%2Fcore.git

quota: Move quota_get_mail_size() to quota-util.c

Makes it available for broader internal use.
---

diff --git a/src/plugins/quota/quota-private.h b/src/plugins/quota/quota-private.h
index 7f3b08f884..a05b98b6d8 100644
--- a/src/plugins/quota/quota-private.h
+++ b/src/plugins/quota/quota-private.h
@@ -144,6 +144,9 @@ bool quota_warning_match(const struct quota_root_settings *w,
 			 uint64_t bytes_before, uint64_t bytes_current,
 			 uint64_t count_before, uint64_t count_current,
 			 const char **reason_r);
+
+int quota_get_mail_size(struct quota_transaction_context *ctx,
+			struct mail *mail, uoff_t *size_r);
 bool quota_transaction_is_over(struct quota_transaction_context *ctx, uoff_t size);
 int quota_transaction_set_limits(struct quota_transaction_context *ctx,
 				 enum quota_get_result *error_result_r,
diff --git a/src/plugins/quota/quota-util.c b/src/plugins/quota/quota-util.c
index 0409ce40a8..737e234fa7 100644
--- a/src/plugins/quota/quota-util.c
+++ b/src/plugins/quota/quota-util.c
@@ -45,6 +45,15 @@ bool quota_warning_match(const struct quota_root_settings *w,
 	return FALSE;
 }
 
+int quota_get_mail_size(struct quota_transaction_context *ctx,
+			struct mail *mail, uoff_t *size_r)
+{
+	if (ctx->quota->vsizes)
+		return mail_get_virtual_size(mail, size_r);
+	else
+		return mail_get_physical_size(mail, size_r);
+}
+
 bool quota_transaction_is_over(struct quota_transaction_context *ctx,
 			       uoff_t size)
 {
diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index 8a2fba7254..f131b6c5d1 100644
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -1078,15 +1078,6 @@ void quota_transaction_rollback(struct quota_transaction_context **_ctx)
 	i_free(ctx);
 }
 
-static int quota_get_mail_size(struct quota_transaction_context *ctx,
-			       struct mail *mail, uoff_t *size_r)
-{
-	if (ctx->quota->vsizes)
-		return mail_get_virtual_size(mail, size_r);
-	else
-		return mail_get_physical_size(mail, size_r);
-}
-
 static void quota_alloc_with_size(struct quota_transaction_context *ctx,
 				  uoff_t size)
 {