diff --git a/src/lib-sieve/sieve-error.c b/src/lib-sieve/sieve-error.c index c1b35c7d9156fde104a64bd3aa94fd933d5c08ab..eb9737c7229bd9f89ca4abf06825ec9bf1523d8b 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, ¶ms, user_prefix, + sieve_criticalv(svinst, ehandler, ¶ms, user_prefix, fmt, args); } T_END; diff --git a/src/lib-sieve/sieve-error.h b/src/lib-sieve/sieve-error.h index 5e633ff9fe0dadb7d0260d40c7b0394939a36083..9b6e988f4e31b59b9d18856e92fcb1e67d16d047 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 ad0505abf55747742321c6c1c3268a6dcc976a24..00f4989beb8f27d9b12bdc7e91db5f69cbe2a3ee 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, ¶ms, + sieve_criticalv(gentr->genenv.svinst, gentr->ehandler, ¶ms, "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 5cc079cec446460d7bcf6069c4dab7045411b25c..36df8c242d7179c72eaf2d731a542fadb4dd3b31 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, ¶ms, + sieve_criticalv(renv->svinst, renv->ehandler, ¶ms, user_prefix, fmt, args); } T_END; diff --git a/src/lib-sieve/sieve-result.c b/src/lib-sieve/sieve-result.c index c5b2300415954f63534fc8209ecbc196855a2c46..b409db63221c0dd87563b37a50f12316e902eead 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, ¶ms, + sieve_criticalv(aenv->svinst, aenv->ehandler, ¶ms, user_prefix, fmt, args); } T_END;