From e331c7275f76c838240f847a16303d0f4cfd8315 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Thu, 1 Oct 2015 00:02:44 +0200
Subject: [PATCH] Sieve metadata extension: Fixed couple of Coverity warnings.
---
src/lib-sieve/plugins/metadata/tst-metadata.c | 3 +--
src/lib-sieve/plugins/metadata/tst-metadataexists.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/lib-sieve/plugins/metadata/tst-metadata.c b/src/lib-sieve/plugins/metadata/tst-metadata.c
index 6307e0a78..76017a90d 100644
--- a/src/lib-sieve/plugins/metadata/tst-metadata.c
+++ b/src/lib-sieve/plugins/metadata/tst-metadata.c
@@ -378,9 +378,8 @@ static int tst_metadata_operation_execute
if ( metadata ) {
if ( !sieve_mailbox_check_name(str_c(mailbox), &error) ) {
- sieve_runtime_warning(renv, NULL, "%s test: "
+ sieve_runtime_warning(renv, NULL, "metadata test: "
"invalid mailbox name `%s' specified: %s",
- (metadata ? "metadata" : "servermetadata"),
str_sanitize(str_c(mailbox), 256), error);
sieve_interpreter_set_test_result(renv->interp, FALSE);
return SIEVE_EXEC_OK;
diff --git a/src/lib-sieve/plugins/metadata/tst-metadataexists.c b/src/lib-sieve/plugins/metadata/tst-metadataexists.c
index 7ba5ad0b0..65842f79c 100644
--- a/src/lib-sieve/plugins/metadata/tst-metadataexists.c
+++ b/src/lib-sieve/plugins/metadata/tst-metadataexists.c
@@ -364,9 +364,8 @@ static int tst_metadataexists_operation_execute
*/
if ( metadata && !sieve_mailbox_check_name(str_c(mailbox), &error) ) {
- sieve_runtime_warning(renv, NULL, "%s test: "
+ sieve_runtime_warning(renv, NULL, "metadata test: "
"invalid mailbox name `%s' specified: %s",
- (metadata ? "metadataexists" : "servermetadataexists"),
str_sanitize(str_c(mailbox), 256), error);
sieve_interpreter_set_test_result(renv->interp, FALSE);
return SIEVE_EXEC_OK;
--
GitLab