From 0e68299a3a18b4adf8791431c5e2ab56967d74bf Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Wed, 3 Jul 2019 13:44:15 +0200
Subject: [PATCH] lib-sieve: sieve-error - Drop error handler hierarchy.
It is no longer used.
---
src/lib-sieve/sieve-error-private.h | 6 ------
src/lib-sieve/sieve-error.c | 29 ++---------------------------
2 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/src/lib-sieve/sieve-error-private.h b/src/lib-sieve/sieve-error-private.h
index a7032b029..e0172b294 100644
--- a/src/lib-sieve/sieve-error-private.h
+++ b/src/lib-sieve/sieve-error-private.h
@@ -20,8 +20,6 @@ struct sieve_error_handler {
struct sieve_instance *svinst;
- struct sieve_error_handler *parent;
-
unsigned int max_errors;
unsigned int errors;
@@ -43,10 +41,6 @@ void sieve_error_handler_init(struct sieve_error_handler *ehandler,
struct sieve_instance *svinst, pool_t pool,
unsigned int max_errors);
-void sieve_error_handler_init_from_parent(struct sieve_error_handler *ehandler,
- pool_t pool,
- struct sieve_error_handler *parent);
-
/*
* Direct handler calls
*/
diff --git a/src/lib-sieve/sieve-error.c b/src/lib-sieve/sieve-error.c
index ccfd2ae35..7fd129e8d 100644
--- a/src/lib-sieve/sieve-error.c
+++ b/src/lib-sieve/sieve-error.c
@@ -591,19 +591,13 @@ bool sieve_errors_more_allowed(struct sieve_error_handler *ehandler)
void sieve_error_handler_accept_infolog(struct sieve_error_handler *ehandler,
bool enable)
{
- while (ehandler != NULL) {
- ehandler->log_info = enable;
- ehandler = ehandler->parent;
- }
+ ehandler->log_info = enable;
}
void sieve_error_handler_accept_debuglog(struct sieve_error_handler *ehandler,
bool enable)
{
- while (ehandler != NULL) {
- ehandler->log_debug = enable;
- ehandler = ehandler->parent;
- }
+ ehandler->log_debug = enable;
}
/*
@@ -623,23 +617,6 @@ void sieve_error_handler_init(struct sieve_error_handler *ehandler,
ehandler->warnings = 0;
}
-void sieve_error_handler_init_from_parent(struct sieve_error_handler *ehandler,
- pool_t pool,
- struct sieve_error_handler *parent)
-{
- i_assert(parent != NULL);
-
- sieve_error_handler_init(ehandler, parent->svinst, pool,
- parent->max_errors);
-
- ehandler->parent = parent;
- sieve_error_handler_ref(parent);
-
- ehandler->master_log = parent->master_log;
- ehandler->log_info = parent->log_info;
- ehandler->log_debug = parent->log_debug;
-}
-
void sieve_error_handler_ref(struct sieve_error_handler *ehandler)
{
if (ehandler == NULL || ehandler->pool == NULL)
@@ -658,8 +635,6 @@ void sieve_error_handler_unref(struct sieve_error_handler **ehandler)
if (--(*ehandler)->refcount != 0)
return;
- if ((*ehandler)->parent != NULL)
- sieve_error_handler_unref(&(*ehandler)->parent);
if ((*ehandler)->free != NULL)
(*ehandler)->free(*ehandler);
--
GitLab