From 62998517afe33f06b0e827fd7f62ba7e0a8032fd Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Tue, 9 Apr 2019 18:36:40 +0200
Subject: [PATCH] lib-sieve: Replace sieve_sys_info() with e_info().
---
src/lib-sieve/plugins/include/ext-include-common.c | 3 ++-
src/lib-sieve/sieve-script.c | 6 +++---
src/lib-sieve/sieve-storage.c | 6 +++---
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/lib-sieve/plugins/include/ext-include-common.c b/src/lib-sieve/plugins/include/ext-include-common.c
index e8fddbdc5..b0e86975d 100644
--- a/src/lib-sieve/plugins/include/ext-include-common.c
+++ b/src/lib-sieve/plugins/include/ext-include-common.c
@@ -157,7 +157,8 @@ struct sieve_storage *ext_include_get_script_storage
case EXT_INCLUDE_LOCATION_GLOBAL:
if ( ctx->global_location == NULL ) {
- sieve_sys_info(svinst, "include: sieve_global is unconfigured; "
+ e_info(svinst->event, "include: "
+ "sieve_global is unconfigured; "
"include of `:global' script `%s' is therefore not possible",
str_sanitize(script_name, 80));
if ( error_r != NULL )
diff --git a/src/lib-sieve/sieve-script.c b/src/lib-sieve/sieve-script.c
index 6abffe77f..b7ee19b38 100644
--- a/src/lib-sieve/sieve-script.c
+++ b/src/lib-sieve/sieve-script.c
@@ -811,9 +811,9 @@ void sieve_script_sys_info(struct sieve_script *script, const char *fmt, ...)
va_list va;
va_start(va, fmt);
- sieve_sys_info(svinst, "%s script: %s",
- script->driver_name, t_strdup_vprintf(fmt, va));
- va_end(va);
+ e_info(svinst->event, "%s script: %s",
+ script->driver_name, t_strdup_vprintf(fmt, va));
+ va_end(va);
}
void sieve_script_sys_debug(struct sieve_script *script, const char *fmt, ...)
diff --git a/src/lib-sieve/sieve-storage.c b/src/lib-sieve/sieve-storage.c
index acf195815..720f68167 100644
--- a/src/lib-sieve/sieve-storage.c
+++ b/src/lib-sieve/sieve-storage.c
@@ -1468,9 +1468,9 @@ void sieve_storage_sys_info(struct sieve_storage *storage,
va_list va;
va_start(va, fmt);
- sieve_sys_info(svinst, "%s storage: %s",
- storage->driver_name, t_strdup_vprintf(fmt, va));
- va_end(va);
+ e_info(svinst->event, "%s storage: %s",
+ storage->driver_name, t_strdup_vprintf(fmt, va));
+ va_end(va);
}
void sieve_storage_sys_debug(struct sieve_storage *storage,
--
GitLab