diff --git a/src/lib-sieve/sieve-error.c b/src/lib-sieve/sieve-error.c index 05cc141eb66c41dc3f292786d7da5cb7c50e59f2..e25c813520f94bce1f94f9d14fd58557c2a22f5c 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 73c301433d3a6e0bc05cfbdeb027fa3f69142990..ef7d4119d4ae720e02659a5116018db0484ac184 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);