From 7793c0dc0d946920ed648012869f8a897eb7e369 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Thu, 11 Jun 2020 20:53:18 +0200
Subject: [PATCH] lib-sieve: plugins: metadata: Reformat tst-metadataexists.c.
---
.../plugins/metadata/tst-metadataexists.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/lib-sieve/plugins/metadata/tst-metadataexists.c b/src/lib-sieve/plugins/metadata/tst-metadataexists.c
index 4eed17bd5..e3c4a7d62 100644
--- a/src/lib-sieve/plugins/metadata/tst-metadataexists.c
+++ b/src/lib-sieve/plugins/metadata/tst-metadataexists.c
@@ -90,7 +90,7 @@ const struct sieve_operation_def metadataexists_operation = {
.ext_def = &mboxmetadata_extension,
.code = EXT_METADATA_OPERATION_METADATAEXISTS,
.dump = tst_metadataexists_operation_dump,
- .execute = tst_metadataexists_operation_execute
+ .execute = tst_metadataexists_operation_execute,
};
/* Mailboxexists operation */
@@ -100,7 +100,7 @@ const struct sieve_operation_def servermetadataexists_operation = {
.ext_def = &servermetadata_extension,
.code = EXT_METADATA_OPERATION_METADATAEXISTS,
.dump = tst_metadataexists_operation_dump,
- .execute = tst_metadataexists_operation_execute
+ .execute = tst_metadataexists_operation_execute,
};
/*
@@ -362,14 +362,15 @@ tst_metadataexists_operation_execute(const struct sieve_runtime_env *renv,
/* Read mailbox */
if (metadata) {
- if ((ret = sieve_opr_string_read(renv, address, "mailbox",
- &mailbox)) <= 0)
+ ret = sieve_opr_string_read(renv, address, "mailbox", &mailbox);
+ if (ret <= 0)
return ret;
}
/* Read annotation names */
- if ((ret = sieve_opr_stringlist_read(renv, address, "annotation-names",
- &anames)) <= 0)
+ ret = sieve_opr_stringlist_read(renv, address, "annotation-names",
+ &anames);
+ if (ret <= 0)
return ret;
/*
@@ -400,9 +401,9 @@ tst_metadataexists_operation_execute(const struct sieve_runtime_env *renv,
trace = sieve_runtime_trace_active(renv, SIEVE_TRLVL_MATCHING);
}
- if ((ret = tst_metadataexists_check_annotations(
- renv, (metadata ? str_c(mailbox) : NULL), anames,
- &all_exist)) <= 0)
+ ret = tst_metadataexists_check_annotations(
+ renv, (metadata ? str_c(mailbox) : NULL), anames, &all_exist);
+ if (ret <= 0)
return ret;
if (trace) {
--
GitLab