From 052097beb475b802979c2561d1ce933ff7e167d2 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Wed, 24 Apr 2019 18:31:09 +0200
Subject: [PATCH] lib-sieve: sieve-error - Rename sieve_vcritical() to
 sieve_criticalv().

This way, it matches the new sieve_logv().
---
 src/lib-sieve/sieve-error.c       | 4 ++--
 src/lib-sieve/sieve-error.h       | 2 +-
 src/lib-sieve/sieve-generator.c   | 2 +-
 src/lib-sieve/sieve-interpreter.c | 2 +-
 src/lib-sieve/sieve-result.c      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib-sieve/sieve-error.c b/src/lib-sieve/sieve-error.c
index c1b35c7d9..eb9737c72 100644
--- a/src/lib-sieve/sieve-error.c
+++ b/src/lib-sieve/sieve-error.c
@@ -303,7 +303,7 @@ void sieve_logv(struct sieve_error_handler *ehandler,
 	sieve_direct_logv(ehandler->svinst, ehandler, params, 0, fmt, args);
 }
 
-void sieve_vcritical(struct sieve_instance *svinst,
+void sieve_criticalv(struct sieve_instance *svinst,
 		     struct sieve_error_handler *ehandler,
 		     const struct sieve_error_params *params,
 		     const char *user_prefix, const char *fmt, va_list args)
@@ -398,7 +398,7 @@ void sieve_critical(struct sieve_instance *svinst,
 	va_start(args, fmt);
 
 	T_BEGIN {
-		sieve_vcritical(svinst, ehandler, &params, user_prefix,
+		sieve_criticalv(svinst, ehandler, &params, user_prefix,
 				fmt, args);
 	} T_END;
 
diff --git a/src/lib-sieve/sieve-error.h b/src/lib-sieve/sieve-error.h
index 5e633ff9f..9b6e988f4 100644
--- a/src/lib-sieve/sieve-error.h
+++ b/src/lib-sieve/sieve-error.h
@@ -84,7 +84,7 @@ sieve_error_script_location(const struct sieve_script *script,
 void sieve_logv(struct sieve_error_handler *ehandler,
 		const struct sieve_error_params *params,
 		const char *fmt, va_list args) ATTR_FORMAT(3, 0);
-void sieve_vcritical(struct sieve_instance *svinst,
+void sieve_criticalv(struct sieve_instance *svinst,
 		     struct sieve_error_handler *ehandler,
 		     const struct sieve_error_params *params,
 		     const char *user_prefix, const char *fmt, va_list args)
diff --git a/src/lib-sieve/sieve-generator.c b/src/lib-sieve/sieve-generator.c
index ad0505abf..00f4989be 100644
--- a/src/lib-sieve/sieve-generator.c
+++ b/src/lib-sieve/sieve-generator.c
@@ -554,7 +554,7 @@ void sieve_generator_critical(struct sieve_generator *gentr,
 		sieve_error_script_location(gentr->genenv.script, source_line);
 
 	va_start(args, fmt);
-	sieve_vcritical(gentr->genenv.svinst, gentr->ehandler, &params,
+	sieve_criticalv(gentr->genenv.svinst, gentr->ehandler, &params,
 			"Code generation failed", fmt, args);
 	va_end(args);
 }
diff --git a/src/lib-sieve/sieve-interpreter.c b/src/lib-sieve/sieve-interpreter.c
index 5cc079cec..36df8c242 100644
--- a/src/lib-sieve/sieve-interpreter.c
+++ b/src/lib-sieve/sieve-interpreter.c
@@ -1024,7 +1024,7 @@ void sieve_runtime_critical(const struct sieve_runtime_env *renv,
 				sieve_runtime_get_full_command_location(renv);
 		}
 
-		sieve_vcritical(renv->svinst, renv->ehandler, &params,
+		sieve_criticalv(renv->svinst, renv->ehandler, &params,
 				user_prefix, fmt, args);
 	} T_END;
 
diff --git a/src/lib-sieve/sieve-result.c b/src/lib-sieve/sieve-result.c
index c5b230041..b409db632 100644
--- a/src/lib-sieve/sieve-result.c
+++ b/src/lib-sieve/sieve-result.c
@@ -1647,7 +1647,7 @@ void sieve_result_critical(const struct sieve_action_exec_env *aenv,
 	va_start(args, fmt);
 
 	T_BEGIN {
-		sieve_vcritical(aenv->svinst, aenv->ehandler, &params,
+		sieve_criticalv(aenv->svinst, aenv->ehandler, &params,
 				user_prefix, fmt, args);
 	} T_END;
 
-- 
GitLab