From 29e05ed8a782510aa7039adad06b3fda82650aeb Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Wed, 30 Jun 2021 13:39:33 +0200
Subject: [PATCH] testsuite: Reformat cmd-test-imap-metadata.c
---
src/testsuite/cmd-test-imap-metadata.c | 175 ++++++++++++++-----------
1 file changed, 96 insertions(+), 79 deletions(-)
diff --git a/src/testsuite/cmd-test-imap-metadata.c b/src/testsuite/cmd-test-imap-metadata.c
index 1c5e2a9f2..7308d4cd5 100644
--- a/src/testsuite/cmd-test-imap-metadata.c
+++ b/src/testsuite/cmd-test-imap-metadata.c
@@ -17,19 +17,22 @@
* Commands
*/
-static bool cmd_test_imap_metadata_registered
- (struct sieve_validator *valdtr, const struct sieve_extension *ext,
- struct sieve_command_registration *cmd_reg);
-static bool cmd_test_imap_metadata_validate
- (struct sieve_validator *valdtr, struct sieve_command *cmd);
-static bool cmd_test_imap_metadata_generate
- (const struct sieve_codegen_env *cgenv, struct sieve_command *ctx);
+static bool
+cmd_test_imap_metadata_registered(struct sieve_validator *valdtr,
+ const struct sieve_extension *ext,
+ struct sieve_command_registration *cmd_reg);
+static bool
+cmd_test_imap_metadata_validate(struct sieve_validator *valdtr,
+ struct sieve_command *cmd);
+static bool
+cmd_test_imap_metadata_generate(const struct sieve_codegen_env *cgenv,
+ struct sieve_command *ctx);
/* Test_mailbox_create command
- *
- * Syntax:
- * test_imap_metadata_set
- * <mailbox: string> <annotation: string> <value:string>
+
+ Syntax:
+ test_imap_metadata_set
+ <mailbox: string> <annotation: string> <value:string>
*/
const struct sieve_command_def cmd_test_imap_metadata_set = {
@@ -48,9 +51,10 @@ const struct sieve_command_def cmd_test_imap_metadata_set = {
* Command tags
*/
-static bool cmd_test_imap_metadata_validate_mailbox_tag
- (struct sieve_validator *valdtr, struct sieve_ast_argument **arg,
- struct sieve_command *cmd);
+static bool
+cmd_test_imap_metadata_validate_mailbox_tag(struct sieve_validator *valdtr,
+ struct sieve_ast_argument **arg,
+ struct sieve_command *cmd);
static const struct sieve_argument_def test_imap_metadata_mailbox_tag = {
.identifier = "mailbox",
@@ -61,10 +65,12 @@ static const struct sieve_argument_def test_imap_metadata_mailbox_tag = {
* Operations
*/
-static bool cmd_test_imap_metadata_operation_dump
- (const struct sieve_dumptime_env *denv, sieve_size_t *address);
-static int cmd_test_imap_metadata_operation_execute
- (const struct sieve_runtime_env *renv, sieve_size_t *address);
+static bool
+cmd_test_imap_metadata_operation_dump(const struct sieve_dumptime_env *denv,
+ sieve_size_t *address);
+static int
+cmd_test_imap_metadata_operation_execute(const struct sieve_runtime_env *renv,
+ sieve_size_t *address);
/* Test_mailbox_create operation */
@@ -73,23 +79,24 @@ const struct sieve_operation_def test_imap_metadata_set_operation = {
.ext_def = &testsuite_extension,
.code = TESTSUITE_OPERATION_TEST_IMAP_METADATA_SET,
.dump = cmd_test_imap_metadata_operation_dump,
- .execute = cmd_test_imap_metadata_operation_execute
+ .execute = cmd_test_imap_metadata_operation_execute,
};
/* Codes for optional arguments */
enum cmd_vacation_optional {
OPT_END,
- OPT_MAILBOX
+ OPT_MAILBOX,
};
/*
* Tag validation
*/
-static bool cmd_test_imap_metadata_validate_mailbox_tag
-(struct sieve_validator *valdtr, struct sieve_ast_argument **arg,
- struct sieve_command *cmd)
+static bool
+cmd_test_imap_metadata_validate_mailbox_tag(struct sieve_validator *valdtr,
+ struct sieve_ast_argument **arg,
+ struct sieve_command *cmd)
{
struct sieve_ast_argument *tag = *arg;
@@ -97,12 +104,11 @@ static bool cmd_test_imap_metadata_validate_mailbox_tag
*arg = sieve_ast_arguments_detach(*arg, 1);
/* Check syntax:
- * :mailbox string
+ :mailbox string
*/
- if ( !sieve_validate_tag_parameter
- (valdtr, cmd, tag, *arg, NULL, 0, SAAT_STRING, FALSE) ) {
+ if (!sieve_validate_tag_parameter(valdtr, cmd, tag, *arg, NULL,
+ 0, SAAT_STRING, FALSE))
return FALSE;
- }
/* Skip parameter */
*arg = sieve_ast_argument_next(*arg);
@@ -113,12 +119,14 @@ static bool cmd_test_imap_metadata_validate_mailbox_tag
* Command registration
*/
-static bool cmd_test_imap_metadata_registered
-(struct sieve_validator *valdtr, const struct sieve_extension *ext,
- struct sieve_command_registration *cmd_reg)
+static bool
+cmd_test_imap_metadata_registered(struct sieve_validator *valdtr,
+ const struct sieve_extension *ext,
+ struct sieve_command_registration *cmd_reg)
{
- sieve_validator_register_tag
- (valdtr, cmd_reg, ext, &test_imap_metadata_mailbox_tag, OPT_MAILBOX);
+ sieve_validator_register_tag(valdtr, cmd_reg, ext,
+ &test_imap_metadata_mailbox_tag,
+ OPT_MAILBOX);
return TRUE;
}
@@ -127,24 +135,23 @@ static bool cmd_test_imap_metadata_registered
* Validation
*/
-static bool cmd_test_imap_metadata_validate
-(struct sieve_validator *valdtr, struct sieve_command *cmd)
+static bool
+cmd_test_imap_metadata_validate(struct sieve_validator *valdtr,
+ struct sieve_command *cmd)
{
struct sieve_ast_argument *arg = cmd->first_positional;
- if ( !sieve_validate_positional_argument
- (valdtr, cmd, arg, "annotation", 2, SAAT_STRING) )
+ if (!sieve_validate_positional_argument(valdtr, cmd, arg, "annotation",
+ 2, SAAT_STRING))
return FALSE;
-
if (!sieve_validator_argument_activate(valdtr, cmd, arg, FALSE))
return FALSE;
arg = sieve_ast_argument_next(arg);
- if ( !sieve_validate_positional_argument
- (valdtr, cmd, arg, "value", 3, SAAT_STRING) )
+ if (!sieve_validate_positional_argument(valdtr, cmd, arg, "value",
+ 3, SAAT_STRING))
return FALSE;
-
if (!sieve_validator_argument_activate(valdtr, cmd, arg, FALSE))
return FALSE;
return TRUE;
@@ -154,18 +161,20 @@ static bool cmd_test_imap_metadata_validate
* Code generation
*/
-static bool cmd_test_imap_metadata_generate
-(const struct sieve_codegen_env *cgenv, struct sieve_command *cmd)
+static bool
+cmd_test_imap_metadata_generate(const struct sieve_codegen_env *cgenv,
+ struct sieve_command *cmd)
{
/* Emit operation */
- if ( sieve_command_is(cmd, cmd_test_imap_metadata_set) )
- sieve_operation_emit
- (cgenv->sblock, cmd->ext, &test_imap_metadata_set_operation);
- else
+ if (sieve_command_is(cmd, cmd_test_imap_metadata_set)) {
+ sieve_operation_emit(cgenv->sblock, cmd->ext,
+ &test_imap_metadata_set_operation);
+ } else {
i_unreached();
+ }
/* Generate arguments */
- if ( !sieve_generate_arguments(cgenv, cmd, NULL) )
+ if (!sieve_generate_arguments(cgenv, cmd, NULL))
return FALSE;
return TRUE;
}
@@ -174,8 +183,9 @@ static bool cmd_test_imap_metadata_generate
* Code dump
*/
-static bool cmd_test_imap_metadata_operation_dump
-(const struct sieve_dumptime_env *denv, sieve_size_t *address)
+static bool
+cmd_test_imap_metadata_operation_dump(const struct sieve_dumptime_env *denv,
+ sieve_size_t *address)
{
int opt_code = 0;
@@ -188,12 +198,13 @@ static bool cmd_test_imap_metadata_operation_dump
int opt;
bool opok = TRUE;
- if ( (opt=sieve_opr_optional_dump(denv, address, &opt_code)) < 0 )
+ opt = sieve_opr_optional_dump(denv, address, &opt_code);
+ if (opt < 0)
return FALSE;
+ if (opt == 0)
+ break;
- if ( opt == 0 ) break;
-
- switch ( opt_code ) {
+ switch (opt_code) {
case OPT_MAILBOX:
opok = sieve_opr_string_dump(denv, address, "mailbox");
break;
@@ -201,20 +212,21 @@ static bool cmd_test_imap_metadata_operation_dump
return FALSE;
}
- if ( !opok ) return FALSE;
- }
+ if (!opok)
+ return FALSE;
+ }
- return
- ( sieve_opr_string_dump(denv, address, "annotation") &&
- sieve_opr_string_dump(denv, address, "value") );
+ return (sieve_opr_string_dump(denv, address, "annotation") &&
+ sieve_opr_string_dump(denv, address, "value"));
}
/*
* Intepretation
*/
-static int cmd_test_imap_metadata_operation_execute
-(const struct sieve_runtime_env *renv, sieve_size_t *address)
+static int
+cmd_test_imap_metadata_operation_execute(const struct sieve_runtime_env *renv,
+ sieve_size_t *address)
{
const struct sieve_operation *oprtn = renv->oprtn;
int opt_code = 0;
@@ -230,43 +242,49 @@ static int cmd_test_imap_metadata_operation_execute
for (;;) {
int opt;
- if ( (opt=sieve_opr_optional_read(renv, address, &opt_code)) < 0 )
+ opt = sieve_opr_optional_read(renv, address, &opt_code);
+ if (opt < 0)
return SIEVE_EXEC_BIN_CORRUPT;
+ if (opt == 0)
+ break;
- if ( opt == 0 ) break;
-
- switch ( opt_code ) {
+ switch (opt_code) {
case OPT_MAILBOX:
- ret = sieve_opr_string_read(renv, address, "mailbox", &mailbox);
+ ret = sieve_opr_string_read(renv, address, "mailbox",
+ &mailbox);
break;
default:
- sieve_runtime_trace_error(renv, "unknown optional operand");
+ sieve_runtime_trace_error(
+ renv, "unknown optional operand");
ret = SIEVE_EXEC_BIN_CORRUPT;
}
- if ( ret <= 0 ) return ret;
+ if (ret <= 0)
+ return ret;
}
/* Fixed operands */
- if ( (ret=sieve_opr_string_read
- (renv, address, "annotation", &annotation)) <= 0 )
+ ret = sieve_opr_string_read(renv, address, "annotation", &annotation);
+ if (ret <= 0)
return ret;
- if ( (ret=sieve_opr_string_read
- (renv, address, "value", &value)) <= 0 )
+ ret = sieve_opr_string_read(renv, address, "value", &value);
+ if (ret <= 0)
return ret;
/*
* Perform operation
*/
- if ( sieve_operation_is(oprtn, test_imap_metadata_set_operation) ) {
- if ( sieve_runtime_trace_active(renv, SIEVE_TRLVL_COMMANDS) ) {
- sieve_runtime_trace(renv, 0, "testsuite/test_imap_metadata_set command");
+ if (sieve_operation_is(oprtn, test_imap_metadata_set_operation)) {
+ if (sieve_runtime_trace_active(renv, SIEVE_TRLVL_COMMANDS)) {
+ sieve_runtime_trace(renv, 0,
+ "testsuite/test_imap_metadata_set command");
sieve_runtime_trace_descend(renv);
if (mailbox == NULL) {
sieve_runtime_trace(renv, 0,
- "set server annotation `%s'", str_c(annotation));
+ "set server annotation `%s'",
+ str_c(annotation));
} else {
sieve_runtime_trace(renv, 0,
"set annotation `%s' for mailbox `%s'",
@@ -274,11 +292,10 @@ static int cmd_test_imap_metadata_operation_execute
}
}
- if (testsuite_mailstore_set_imap_metadata
- (( mailbox == NULL ? NULL : str_c(mailbox) ),
- str_c(annotation), str_c(value)) < 0)
+ if (testsuite_mailstore_set_imap_metadata(
+ (mailbox == NULL ? NULL : str_c(mailbox)),
+ str_c(annotation), str_c(value)) < 0)
return SIEVE_EXEC_FAILURE;
}
-
return SIEVE_EXEC_OK;
}
--
GitLab