dovecot-2.2-pigeonhole: Sieve metadata extension: Fixed couple o...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/51e2872510a8
changeset: 2108:51e2872510a8
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Thu Oct 01 00:02:44 2015 +0200
description:
Sieve metadata extension: Fixed couple of Coverity warnings.

diffstat:

 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(-)

diffs (28 lines):

diff -r 9ac3914392a4 -r 51e2872510a8 src/lib-sieve/plugins/metadata/tst-metadata.c
--- a/src/lib-sieve/plugins/metadata/tst-metadata.c	Wed Sep 30 00:54:40 2015 +0200
+++ b/src/lib-sieve/plugins/metadata/tst-metadata.c	Thu Oct 01 00:02:44 2015 +0200
@@ -378,9 +378,8 @@
 
 	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 -r 9ac3914392a4 -r 51e2872510a8 src/lib-sieve/plugins/metadata/tst-metadataexists.c
--- a/src/lib-sieve/plugins/metadata/tst-metadataexists.c	Wed Sep 30 00:54:40 2015 +0200
+++ b/src/lib-sieve/plugins/metadata/tst-metadataexists.c	Thu Oct 01 00:02:44 2015 +0200
@@ -364,9 +364,8 @@
 	 */
 
 	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;