From f73ce51d2c0046e52367a426f7de1c9e21c72297 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sun, 10 Mar 2019 23:58:10 +0100
Subject: [PATCH] lib-sieve: Drop sieve_sys_* log functions.
---
src/lib-sieve/sieve-error.c | 88 -------------------------------------
src/lib-sieve/sieve-error.h | 24 ----------
2 files changed, 112 deletions(-)
diff --git a/src/lib-sieve/sieve-error.c b/src/lib-sieve/sieve-error.c
index 05cc141eb..e25c81352 100644
--- a/src/lib-sieve/sieve-error.c
+++ b/src/lib-sieve/sieve-error.c
@@ -222,94 +222,6 @@ void sieve_direct_vdebug(struct sieve_instance *svinst,
* System errors
*/
-void sieve_sys_verror(struct sieve_instance *svinst,
- const char *fmt, va_list args)
-{
- T_BEGIN {
- sieve_direct_verror(svinst, svinst->system_ehandler,
- 0, NULL, fmt, args);
- } T_END;
-}
-
-void sieve_sys_vwarning(struct sieve_instance *svinst,
- const char *fmt, va_list args)
-{
- T_BEGIN {
- sieve_direct_vwarning(svinst, svinst->system_ehandler,
- 0, NULL, fmt, args);
- } T_END;
-}
-
-void sieve_sys_vinfo(struct sieve_instance *svinst,
- const char *fmt, va_list args)
-{
- T_BEGIN {
- sieve_direct_vinfo(svinst, svinst->system_ehandler,
- 0, NULL, fmt, args);
- } T_END;
-}
-
-void sieve_sys_vdebug(struct sieve_instance *svinst,
- const char *fmt, va_list args)
-{
- T_BEGIN {
- sieve_direct_vdebug(svinst, svinst->system_ehandler,
- 0, NULL, fmt, args);
- } T_END;
-}
-
-void sieve_sys_error(struct sieve_instance *svinst, const char *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
-
- T_BEGIN {
- sieve_direct_verror(svinst, svinst->system_ehandler,
- 0, NULL, fmt, args);
- } T_END;
-
- va_end(args);
-}
-
-void sieve_sys_warning(struct sieve_instance *svinst, const char *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
-
- T_BEGIN {
- sieve_direct_vwarning(svinst, svinst->system_ehandler,
- 0, NULL, fmt, args);
- } T_END;
-
- va_end(args);
-}
-
-void sieve_sys_info(struct sieve_instance *svinst, const char *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
-
- T_BEGIN {
- sieve_direct_vinfo(svinst, svinst->system_ehandler,
- 0, NULL, fmt, args);
- } T_END;
-
- va_end(args);
-}
-
-void sieve_sys_debug(struct sieve_instance *svinst, const char *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
-
- T_BEGIN {
- sieve_direct_vdebug(svinst, svinst->system_ehandler,
- 0, NULL, fmt, args);
- } T_END;
-
- va_end(args);
-}
-
void sieve_system_ehandler_set(struct sieve_error_handler *ehandler)
{
struct sieve_instance *svinst = ehandler->svinst;
diff --git a/src/lib-sieve/sieve-error.h b/src/lib-sieve/sieve-error.h
index 73c301433..ef7d4119d 100644
--- a/src/lib-sieve/sieve-error.h
+++ b/src/lib-sieve/sieve-error.h
@@ -28,34 +28,10 @@ typedef void (*sieve_error_func_t)(struct sieve_error_handler *ehandler,
const char *location, const char *fmt, ...)
ATTR_FORMAT(3, 4);
-typedef void (*sieve_sys_error_vfunc_t)(struct sieve_instance *svinst,
- const char *fmt, va_list args)
- ATTR_FORMAT(2, 0);;
-typedef void (*sieve_sys_error_func_t)(struct sieve_instance *svinst,
- const char *fmt, ...) ATTR_FORMAT(2, 3);
-
/*
* System errors
*/
-void sieve_sys_verror(struct sieve_instance *svinst,
- const char *fmt, va_list args) ATTR_FORMAT(2, 0);;
-void sieve_sys_vwarning(struct sieve_instance *svinst,
- const char *fmt, va_list args) ATTR_FORMAT(2, 0);;
-void sieve_sys_vinfo(struct sieve_instance *svinst,
- const char *fmt, va_list args) ATTR_FORMAT(2, 0);;
-void sieve_sys_vdebug(struct sieve_instance *svinst,
- const char *fmt, va_list args) ATTR_FORMAT(2, 0);;
-
-void sieve_sys_error(struct sieve_instance *svinst,
- const char *fmt, ...) ATTR_FORMAT(2, 3);
-void sieve_sys_warning(struct sieve_instance *svinst,
- const char *fmt, ...) ATTR_FORMAT(2, 3);
-void sieve_sys_info(struct sieve_instance *svinst,
- const char *fmt, ...) ATTR_FORMAT(2, 3);
-void sieve_sys_debug(struct sieve_instance *svinst,
- const char *fmt, ...) ATTR_FORMAT(2, 3);
-
void sieve_system_ehandler_set(struct sieve_error_handler *ehandler);
struct sieve_error_handler *
sieve_system_ehandler_get(struct sieve_instance *svinst);
--
GitLab