From 5ca452a177b41b86cf44212b978aabf2a0be9537 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Tue, 17 Sep 2024 00:38:10 +0200
Subject: [PATCH] lib-sieve: sieve-storage - Rename sieve_storage_create_main()
to sieve_storage_create_personal()
---
.../plugins/include/ext-include-common.c | 4 ++--
src/lib-sieve/sieve-storage.c | 19 ++++++++++---------
src/lib-sieve/sieve-storage.h | 7 ++++---
src/managesieve/managesieve-client.c | 6 +++---
src/plugins/doveadm-sieve/doveadm-sieve-cmd.c | 2 +-
.../doveadm-sieve/doveadm-sieve-sync.c | 4 ++--
.../imap-filter-sieve/imap-filter-sieve.c | 6 +++---
src/plugins/imapsieve/imap-sieve.c | 5 +++--
src/plugins/lda-sieve/lda-sieve-plugin.c | 3 ++-
9 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/src/lib-sieve/plugins/include/ext-include-common.c b/src/lib-sieve/plugins/include/ext-include-common.c
index e6dcc0f98..8de2275fb 100644
--- a/src/lib-sieve/plugins/include/ext-include-common.c
+++ b/src/lib-sieve/plugins/include/ext-include-common.c
@@ -144,8 +144,8 @@ ext_include_get_script_storage(const struct sieve_extension *ext,
case EXT_INCLUDE_LOCATION_PERSONAL:
if (ctx->personal_storage == NULL) {
ctx->personal_storage =
- sieve_storage_create_main(svinst, NULL, 0,
- error_code_r);
+ sieve_storage_create_personal(svinst, NULL, 0,
+ error_code_r);
}
return ctx->personal_storage;
case EXT_INCLUDE_LOCATION_GLOBAL:
diff --git a/src/lib-sieve/sieve-storage.c b/src/lib-sieve/sieve-storage.c
index 5ffbc7b95..118dbf212 100644
--- a/src/lib-sieve/sieve-storage.c
+++ b/src/lib-sieve/sieve-storage.c
@@ -389,10 +389,10 @@ sieve_storage_create(struct sieve_instance *svinst, const char *location,
}
static struct sieve_storage *
-sieve_storage_do_create_main(struct sieve_instance *svinst,
- struct mail_user *user,
- enum sieve_storage_flags flags,
- enum sieve_error *error_code_r)
+sieve_storage_do_create_personal(struct sieve_instance *svinst,
+ struct mail_user *user,
+ enum sieve_storage_flags flags,
+ enum sieve_error *error_code_r)
{
struct sieve_storage *storage = NULL;
const struct sieve_storage *sieve_class = NULL;
@@ -470,9 +470,10 @@ sieve_storage_do_create_main(struct sieve_instance *svinst,
}
struct sieve_storage *
-sieve_storage_create_main(struct sieve_instance *svinst, struct mail_user *user,
- enum sieve_storage_flags flags,
- enum sieve_error *error_code_r)
+sieve_storage_create_personal(struct sieve_instance *svinst,
+ struct mail_user *user,
+ enum sieve_storage_flags flags,
+ enum sieve_error *error_code_r)
{
struct sieve_storage *storage;
const char *set_enabled, *set_default, *set_default_name;
@@ -496,8 +497,8 @@ sieve_storage_create_main(struct sieve_instance *svinst, struct mail_user *user,
set_default = sieve_setting_get(svinst, "sieve_default");
/* Attempt to locate user's main storage */
- storage = sieve_storage_do_create_main(svinst, user, flags,
- error_code_r);
+ storage = sieve_storage_do_create_personal(svinst, user, flags,
+ error_code_r);
if (storage != NULL) {
/* Success; record default script location for later use */
storage->default_location =
diff --git a/src/lib-sieve/sieve-storage.h b/src/lib-sieve/sieve-storage.h
index 76be03885..f766587eb 100644
--- a/src/lib-sieve/sieve-storage.h
+++ b/src/lib-sieve/sieve-storage.h
@@ -30,9 +30,10 @@ sieve_storage_create(struct sieve_instance *svinst, const char *location,
enum sieve_storage_flags flags,
enum sieve_error *error_code_r);
struct sieve_storage *
-sieve_storage_create_main(struct sieve_instance *svinst, struct mail_user *user,
- enum sieve_storage_flags flags,
- enum sieve_error *error_code_r);
+sieve_storage_create_personal(struct sieve_instance *svinst,
+ struct mail_user *user,
+ enum sieve_storage_flags flags,
+ enum sieve_error *error_code_r);
void sieve_storage_ref(struct sieve_storage *storage);
void sieve_storage_unref(struct sieve_storage **_storage);
diff --git a/src/managesieve/managesieve-client.c b/src/managesieve/managesieve-client.c
index 47bd0dd3c..1ae8e1e6d 100644
--- a/src/managesieve/managesieve-client.c
+++ b/src/managesieve/managesieve-client.c
@@ -71,9 +71,9 @@ client_get_storage(struct sieve_instance *svinst, struct event *event,
/* Open personal script storage */
- storage = sieve_storage_create_main(svinst, user,
- SIEVE_STORAGE_FLAG_READWRITE,
- &error_code);
+ storage = sieve_storage_create_personal(svinst, user,
+ SIEVE_STORAGE_FLAG_READWRITE,
+ &error_code);
if (storage == NULL) {
switch (error_code) {
case SIEVE_ERROR_NOT_POSSIBLE:
diff --git a/src/plugins/doveadm-sieve/doveadm-sieve-cmd.c b/src/plugins/doveadm-sieve/doveadm-sieve-cmd.c
index af0cf2206..a5cedb496 100644
--- a/src/plugins/doveadm-sieve/doveadm-sieve-cmd.c
+++ b/src/plugins/doveadm-sieve/doveadm-sieve-cmd.c
@@ -117,7 +117,7 @@ doveadm_sieve_cmd_run(struct doveadm_mail_cmd_context *_ctx,
if (ctx->svinst == NULL)
return -1;
- ctx->storage = sieve_storage_create_main(
+ ctx->storage = sieve_storage_create_personal(
ctx->svinst, user, SIEVE_STORAGE_FLAG_READWRITE, &error_code);
if (ctx->storage == NULL) {
switch (error_code) {
diff --git a/src/plugins/doveadm-sieve/doveadm-sieve-sync.c b/src/plugins/doveadm-sieve/doveadm-sieve-sync.c
index 1ea6eb65e..05abee587 100644
--- a/src/plugins/doveadm-sieve/doveadm-sieve-sync.c
+++ b/src/plugins/doveadm-sieve/doveadm-sieve-sync.c
@@ -99,8 +99,8 @@ mail_sieve_user_init(struct mail_user *user, struct sieve_storage **svstorage_r)
return -1;
suser->sieve_storage =
- sieve_storage_create_main(suser->svinst, user,
- storage_flags, NULL);
+ sieve_storage_create_personal(suser->svinst, user,
+ storage_flags, NULL);
*svstorage_r = suser->sieve_storage;
return (suser->sieve_storage != NULL ? 1 : 0);
diff --git a/src/plugins/imap-filter-sieve/imap-filter-sieve.c b/src/plugins/imap-filter-sieve/imap-filter-sieve.c
index 0f9b2f195..c275d90eb 100644
--- a/src/plugins/imap-filter-sieve/imap-filter-sieve.c
+++ b/src/plugins/imap-filter-sieve/imap-filter-sieve.c
@@ -190,9 +190,9 @@ imap_filter_sieve_get_personal_storage(struct imap_filter_sieve_context *sctx,
return -1;
}
- ifsuser->storage = sieve_storage_create_main(svinst, user,
- storage_flags,
- &error_code);
+ ifsuser->storage = sieve_storage_create_personal(svinst, user,
+ storage_flags,
+ &error_code);
if (ifsuser->storage != NULL) {
*storage_r = ifsuser->storage;
return 0;
diff --git a/src/plugins/imapsieve/imap-sieve.c b/src/plugins/imapsieve/imap-sieve.c
index 0dd7a0151..0aaf363c1 100644
--- a/src/plugins/imapsieve/imap-sieve.c
+++ b/src/plugins/imapsieve/imap-sieve.c
@@ -144,8 +144,9 @@ imap_sieve_get_storage(struct imap_sieve *isieve,
return -1;
}
- isieve->storage = sieve_storage_create_main(isieve->svinst, user,
- storage_flags, &error_code);
+ isieve->storage = sieve_storage_create_personal(isieve->svinst, user,
+ storage_flags,
+ &error_code);
if (isieve->storage == NULL) {
if (error_code == SIEVE_ERROR_TEMP_FAILURE)
return -1;
diff --git a/src/plugins/lda-sieve/lda-sieve-plugin.c b/src/plugins/lda-sieve/lda-sieve-plugin.c
index aca303109..66bd0e859 100644
--- a/src/plugins/lda-sieve/lda-sieve-plugin.c
+++ b/src/plugins/lda-sieve/lda-sieve-plugin.c
@@ -256,7 +256,8 @@ lda_sieve_get_personal_storage(struct sieve_instance *svinst,
struct sieve_storage **storage_r,
enum sieve_error *error_code_r)
{
- *storage_r = sieve_storage_create_main(svinst, user, 0, error_code_r);
+ *storage_r = sieve_storage_create_personal(svinst, user, 0,
+ error_code_r);
if (*storage_r == NULL) {
switch (*error_code_r) {
case SIEVE_ERROR_NOT_POSSIBLE:
--
GitLab