From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 13 Aug 2024 10:53:56 +0000 (+0300)
Subject: quota: Remove quota_settings.initialized
X-Git-Tag: 2.4.1~692
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79455cff21bde580136ad2a24c1127c7bb9bcdc5;p=thirdparty%2Fdovecot%2Fcore.git

quota: Remove quota_settings.initialized

This was only used for checking whether a debug log message should have been
sent. But if that code was reached, quota must have been initialized.
---

diff --git a/src/plugins/quota/quota-private.h b/src/plugins/quota/quota-private.h
index 5d5311cd2f..305dc89fb9 100644
--- a/src/plugins/quota/quota-private.h
+++ b/src/plugins/quota/quota-private.h
@@ -32,7 +32,6 @@ struct quota_settings {
 	uoff_t max_mail_size;
 	unsigned int max_messages_per_mailbox;
 	const char *quota_exceeded_msg;
-	bool initialized:1;
 	bool vsizes:1;
 };
 
diff --git a/src/plugins/quota/quota-util.c b/src/plugins/quota/quota-util.c
index e9ff3262c5..aed61f2a3b 100644
--- a/src/plugins/quota/quota-util.c
+++ b/src/plugins/quota/quota-util.c
@@ -130,13 +130,11 @@ void quota_root_recalculate_relative_rules(struct quota_root_settings *root_set,
 					      bytes_limit, 0);
 	root_set->last_mail_max_extra_bytes = root_set->grace_rule.bytes_limit;
 
-	if (root_set->set->initialized) {
-		e_debug(root_set->set->event,
-			"Quota root %s: Recalculated relative rules with "
-			"bytes=%lld count=%lld. Now grace=%"PRIu64, root_set->name,
-			(long long)bytes_limit, (long long)count_limit,
-			root_set->last_mail_max_extra_bytes);
-	}
+	e_debug(root_set->set->event,
+		"Quota root %s: Recalculated relative rules with "
+		"bytes=%lld count=%lld. Now grace=%"PRIu64, root_set->name,
+		(long long)bytes_limit, (long long)count_limit,
+		root_set->last_mail_max_extra_bytes);
 }
 
 static int
diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index 64014ad6ea..34fce4a6d8 100644
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -351,7 +351,6 @@ int quota_user_read_settings(struct mail_user *user,
 		return 0;
 	}
 
-	quota_set->initialized = TRUE;
 	*set_r = quota_set;
 	return 1;
 }