From 4019a7245af30f31c3ca971ff10f8120a20250c6 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Wed, 24 Apr 2019 09:08:02 +0200
Subject: [PATCH] lib-sieve: sieve-validator - Reorder error handling
functions.
---
src/lib-sieve/sieve-validator.c | 22 +++++++++++-----------
src/lib-sieve/sieve-validator.h | 6 +++---
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/lib-sieve/sieve-validator.c b/src/lib-sieve/sieve-validator.c
index 580305f9a..017dc4fa5 100644
--- a/src/lib-sieve/sieve-validator.c
+++ b/src/lib-sieve/sieve-validator.c
@@ -1659,27 +1659,27 @@ sieve_validator_object_registry_init(struct sieve_validator *valdtr,
* Error handling
*/
-void sieve_validator_warning(struct sieve_validator *valdtr,
- unsigned int source_line, const char *fmt, ...)
+void sieve_validator_error(struct sieve_validator *valdtr,
+ unsigned int source_line, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
- sieve_vwarning(valdtr->ehandler,
- sieve_error_script_location(valdtr->script, source_line),
- fmt, args);
+ sieve_verror(valdtr->ehandler,
+ sieve_error_script_location(valdtr->script, source_line),
+ fmt, args);
va_end(args);
-
}
-void sieve_validator_error(struct sieve_validator *valdtr,
- unsigned int source_line, const char *fmt, ...)
+void sieve_validator_warning(struct sieve_validator *valdtr,
+ unsigned int source_line, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
- sieve_verror(valdtr->ehandler,
- sieve_error_script_location(valdtr->script, source_line),
- fmt, args);
+ sieve_vwarning(valdtr->ehandler,
+ sieve_error_script_location(valdtr->script, source_line),
+ fmt, args);
va_end(args);
+
}
diff --git a/src/lib-sieve/sieve-validator.h b/src/lib-sieve/sieve-validator.h
index a30309a08..d658bccce 100644
--- a/src/lib-sieve/sieve-validator.h
+++ b/src/lib-sieve/sieve-validator.h
@@ -180,12 +180,12 @@ sieve_validator_object_registry_init(struct sieve_validator *valdtr,
* Error handling
*/
-void sieve_validator_warning(struct sieve_validator *valdtr,
- unsigned int source_line, const char *fmt, ...)
- ATTR_FORMAT(3, 4);
void sieve_validator_error(struct sieve_validator *valdtr,
unsigned int source_line, const char *fmt, ...)
ATTR_FORMAT(3, 4);
+void sieve_validator_warning(struct sieve_validator *valdtr,
+ unsigned int source_line, const char *fmt, ...)
+ ATTR_FORMAT(3, 4);
void sieve_validator_critical(struct sieve_validator *valdtr,
unsigned int source_line, const char *fmt, ...)
ATTR_FORMAT(3, 4);
--
GitLab