From b8040c344db48e4680b2525da876cc8c7250e53b Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Mon, 11 Nov 2024 18:34:12 +0100
Subject: [PATCH] lib-sieve: sieve-storage-settings - Rename quota settings for
consistency with mail storage
---
src/lib-sieve/sieve-storage-settings.c | 8 ++++----
src/lib-sieve/sieve-storage-settings.h | 4 ++--
src/lib-sieve/sieve-storage.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib-sieve/sieve-storage-settings.c b/src/lib-sieve/sieve-storage-settings.c
index 1e08b2340..36463963e 100644
--- a/src/lib-sieve/sieve-storage-settings.c
+++ b/src/lib-sieve/sieve-storage-settings.c
@@ -35,8 +35,8 @@ static const struct setting_define sieve_storage_setting_defines[] = {
DEF(STR, script_name),
DEF(STR, script_bin_path),
- DEF(SIZE, quota_max_storage),
- DEF(UINT, quota_max_scripts),
+ DEF(SIZE, quota_storage_size),
+ DEF(UINT, quota_script_count),
{ .type = SET_FILTER_ARRAY, .key = "sieve_script",
.offset = offsetof(struct sieve_storage_settings, storages),
@@ -57,8 +57,8 @@ static const struct sieve_storage_settings sieve_storage_default_settings = {
.script_name = "",
.script_bin_path = "",
- .quota_max_storage = 0,
- .quota_max_scripts = 0,
+ .quota_storage_size = 0,
+ .quota_script_count = 0,
.storages = ARRAY_INIT,
};
diff --git a/src/lib-sieve/sieve-storage-settings.h b/src/lib-sieve/sieve-storage-settings.h
index 4d7cc2158..2cc45f456 100644
--- a/src/lib-sieve/sieve-storage-settings.h
+++ b/src/lib-sieve/sieve-storage-settings.h
@@ -16,8 +16,8 @@ struct sieve_storage_settings {
const char *script_name;
const char *script_bin_path;
- uoff_t quota_max_storage;
- unsigned int quota_max_scripts;
+ uoff_t quota_storage_size;
+ unsigned int quota_script_count;
ARRAY_TYPE(const_string) storages;
};
diff --git a/src/lib-sieve/sieve-storage.c b/src/lib-sieve/sieve-storage.c
index 139a36be2..6a857b8c9 100644
--- a/src/lib-sieve/sieve-storage.c
+++ b/src/lib-sieve/sieve-storage.c
@@ -297,8 +297,8 @@ int sieve_storage_alloc_with_settings(struct sieve_instance *svinst,
return -1;
storage->bin_path = p_strdup_empty(storage->pool, set->script_bin_path);
- storage->max_storage = set->quota_max_storage;
- storage->max_scripts = set->quota_max_scripts;
+ storage->max_storage = set->quota_storage_size;
+ storage->max_scripts = set->quota_script_count;
if (storage->max_storage > 0) {
e_debug(storage->event, "quota: "
--
GitLab