From 754dc426a1fa0faa8a4cc2f437606da2012eef65 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Mon, 2 Sep 2024 01:26:19 +0200
Subject: [PATCH] lib-sieve: sieve-storage - Change storage_class parameter of
sieve_storage_create_event() into driver_name
---
src/lib-sieve/sieve-storage.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/lib-sieve/sieve-storage.c b/src/lib-sieve/sieve-storage.c
index 76dbb9f10..92d98095e 100644
--- a/src/lib-sieve/sieve-storage.c
+++ b/src/lib-sieve/sieve-storage.c
@@ -123,18 +123,16 @@ bool sieve_storage_class_exists(struct sieve_instance *svinst,
static struct event *
sieve_storage_create_event(struct sieve_instance *svinst,
- struct event *event_parent,
- const struct sieve_storage *storage_class)
+ struct event *event_parent, const char *driver_name)
{
struct event *event;
event = event_create(event_parent == NULL ?
svinst->event : event_parent);
event_add_category(event, &event_category_sieve_storage);
- event_add_str(event, "driver", storage_class->driver_name);
+ event_add_str(event, "driver", driver_name);
event_set_append_log_prefix(
- event, t_strdup_printf("%s storage: ",
- storage_class->driver_name));
+ event, t_strdup_printf("%s storage: ", driver_name));
return event;
}
@@ -299,7 +297,7 @@ int sieve_storage_alloc(struct sieve_instance *svinst, struct event *event,
event_ref(storage->event);
} else {
storage->event = sieve_storage_create_event(
- svinst, svinst->event, storage_class);
+ svinst, svinst->event, storage_class->driver_name);
}
*storage_r = storage;
@@ -329,7 +327,7 @@ sieve_storage_init(struct sieve_instance *svinst,
i_assert(storage_class->v.init != NULL);
event = sieve_storage_create_event(svinst, svinst->event,
- storage_class);
+ storage_class->driver_name);
if ((flags & SIEVE_STORAGE_FLAG_SYNCHRONIZING) != 0 &&
!storage_class->allows_synchronization) {
--
GitLab